Merge pull request #151 from usegalaxy-au/dev

DiaNN license in HTML
usegalaxy-au · Aug 27, 2024 · eb67329 · eb67329
2 parents 80ad2cf + af6d656
commit eb67329
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 47 deletions.
diff --git a/webapp/home/forms.py b/webapp/home/forms.py
@@ -467,7 +467,7 @@ class DiannRequestForm(BaseAccessRequestForm):
 
     terms = {
         'button_text': 'View license',
-        'src': static('home/documents/diann-1.8-license.txt'),
+        'src': static('home/documents/diann-1.8-license.html'),
         'agreement_name': f'{RESOURCE_NAME} End User Licence Agreement',
     }
 

diff --git a/webapp/home/static/home/documents/diann-1.8-license.html b/webapp/home/static/home/documents/diann-1.8-license.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Dia-NN 1.8 license</title>
+</head>
+<body>
+  <pre style="font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; white-space: pre-line; padding: 1rem;">
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+    1. General. The DIA-NN software is licensed to you for use only under the terms of this License, and all rights not expressly granted to you are reserved. The rights granted herein are limited to Vadim Demichev's intellectual property rights in the DIA-NN software and do not include any other patents or intellectual property rights.
+
+    2. Permitted License Uses and Restrictions. This License allows you to install and use the DIA-NN software. You may make one copy of the DIA-NN Software in machine-readable form for backup purposes only; provided that the backup copy must include all copyright or other proprietary notices contained on the original. Except as and only to the extent expressly permitted in this License or by applicable law, you may not copy, decompile, reverse engineer, disassemble, attempt to derive the source code of, modify, or create derivative works of the DIA-NN software or any thereof.
+
+    3. Transfer. You may not rent, lease, lend or sublicense the DIA-NN software. You may, however, make a one-time permanent transfer of all of your license rights to the DIA-NN software to another party, provided that: (a) the transfer must include all of the DIA-NN, including all its component parts, original media, printed materials and this License; (b) you do not retain any copies of the DIA-NN, full or partial, including copies stored on a computer or other storage device; and (c) the party receiving the DIA-NN software reads and agrees to accept the terms and conditions of this License.
+
+    4. Attribution. If you share, distribute or publish any materials that were produced using the DIA-NN software ("Derived Materials"), you must indicate  within these Derived Materials that they were produced using the DIA-NN software. You may satisfy this condition in any reasonable manner  based on the medium, means, and context in which you share the Derived Materials. For example, the required attribution can be expressed by including  one of the statements "Processed using DIA-NN", "Generated using DIA-NN" or "Produced using DIA-NN" in the Derived Materials.
+
+    5. All third-party software included in this DIA-NN software distribution retains its original license (see below).  For the inclusion in this DIA-NN software distribution, the source code of MSToolkit and MiniDNN was modified.
+
+    MiniDNN
+     - folder within this distribution: /MiniDNN
+     - URL: https://github.com/yixuan/MiniDNN
+     - License information: /MiniDNN/LICENSE.txt
+
+    MSToolkit
+     - folder within this distribution: /mstoolkit
+     - URL: https://github.com/mhoopmann/mstoolkit
+     - License information: /mstoolkit/LICENSE.txt
+
+    Eigen
+     - folder within this distribution: /eigen
+     - URL: http://eigen.tuxfamily.org/
+     - License information: eigen/COPYING.README
+  </pre>
+</body>
+</html>
diff --git a/webapp/home/static/home/documents/diann-1.8-license.txt b/webapp/home/static/home/documents/diann-1.8-license.txt