Merge pull request #52 from biocore/remove_gpl

Remove GPL code
biocore · Dec 13, 2022 · 4d2fa1c · 4d2fa1c
2 parents 51de139 + fa889a4
commit 4d2fa1c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 842 deletions.
diff --git a/README.md b/README.md
@@ -51,4 +51,4 @@ Options:
   --help                          Show this message and exit.
 ```
 
-Note that the multifurcating support relies on GPL code derived from the Genesis project. That code and LICENSE can be found under `bp/GPL`.
+Note that the multifurcating support relies on GPL code derived from the Genesis project. To use this method, please install [iow-gpl](https://github.com/biocore/improved-octo-waddle-gpl).
diff --git a/bp/GPL/Genesis_LICENSE.txt b/bp/GPL/Genesis_LICENSE.txt
diff --git a/bp/GPL/__init__.py b/bp/GPL/__init__.py
diff --git a/bp/GPL/_insert.pyx b/bp/GPL/_insert.pyx
diff --git a/bp/GPL/tests/test_insert.py b/bp/GPL/tests/test_insert.py
diff --git a/bp/_cli.py b/bp/_cli.py
@@ -1,7 +1,10 @@
 import click
 from bp import parse_jplace, insert_fully_resolved
-from bp.GPL import insert_multifurcating
 
+try:
+    from bp.GPL import insert_multifurcating
+except:
+    insert_multifurcating = None
 
 @click.group()
 def cli():
@@ -20,6 +23,8 @@ def placement(placements, output, method):
     if method == 'fully-resolved':
         f = insert_fully_resolved
     elif method == 'multifurcating':
+        if insert_multifurcating is None:
+            raise ValueError("Please install with 'pip install iow-gpl'")
         f = insert_multifurcating
     else:
         raise ValueError("Unknown method: %s" % method)

diff --git a/setup.py b/setup.py
@@ -85,8 +85,6 @@ def run(self):
                         ["bp/_binary_tree" + ext], ),
               Extension("bp._insert",
                         ["bp/_insert" + ext], ),
-              Extension("bp.GPL._insert",
-                        ["bp/GPL/_insert" + ext], ),
               Extension("bp.tests.test_bp_cy",
                         ["bp/tests/test_bp_cy" + ext],
                         include_dirs=['bp/BitArray/'],