update setup

WGS-TB · Apr 30, 2021 · 2cd53c1 · 2cd53c1
1 parent 2dff73a
commit 2cd53c1
Show file tree

Hide file tree

Showing 6 changed files with 686 additions and 6 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/group_testing/__init__.py b/group_testing/__init__.py
@@ -1,2 +1,2 @@
 _program = "GroupTesting"
-__version__ = "0.1.0"
+__version__ = "0.4.0"
diff --git a/group_testing/config.yml b/group_testing/config.yml
@@ -48,7 +48,7 @@ decode:
       'lambda_e': 4
       'is_it_noiseless': True
       'lp_relaxation': False
-      'solver_name': 'CPLEX_PY'
+      'solver_name': 'PULP_CBC_CMD'
       #['GLPK_CMD', 'CPLEX_PY', 'GUROBI_CMD', 'PULP_CBC_CMD', 'COIN_CMD', 'PULP_CHOCO_CMD']
       'solver_options':
         'timeLimit': 1800
@@ -60,4 +60,4 @@ decode:
     #'mip':True
   'evaluation':
     #'eval_metric': 'recall'
-    'eval_metric': 'balanced_accuracy'
+    'eval_metric': 'balanced_accuracy'
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
-cplex
 numpy
 pandas
 pulp

diff --git a/setup.py b/setup.py
@@ -6,12 +6,13 @@
     requirements = f.read().splitlines()
 
 setup(
-    name=_program,
+    name="GroupTesting",
     version=__version__,
     author="Hooman Zabeti, Nick Dexter",
+    author_email="[email protected], [email protected]"
     description="Group testing for SARS-CoV-2 in large populations.",
     url="https://github.com/WGS-TB/GroupTesting",
-    license="TBD",
+    license="GPL-3",
     packages=["group_testing"],
     entry_points="""
     [console_scripts]
-Original file line number
+Diff line change
@@ -1,4 +1,3 @@
-    cplex
     numpy
     pandas
     pulp
@@ Expand Down @@