Merge pull request #13 from GertjanBisschop/restructure

restructure
LohseLab · Sep 12, 2023 · d111d8d · d111d8d
2 parents 93e9e0f + 2e215f9
commit d111d8d
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/gimbleprep → gimbleprep.py b/gimbleprep → gimbleprep.py
diff --git a/cli/__init__.py → gimbleprep/__init__.py b/cli/__init__.py → gimbleprep/__init__.py
diff --git a/cli/interface.py → gimbleprep/interface.py b/cli/interface.py → gimbleprep/interface.py
@@ -22,7 +22,7 @@
 from timeit import default_timer as timer
 
 RUNNER_BY_MODULE = {
-    'preprocess': 'cli.preprocess', 
+    'preprocess': 'gimbleprep.preprocess', 
 }
 MODULES = RUNNER_BY_MODULE.keys()
 

diff --git a/cli/preprocess.py → gimbleprep/preprocess.py b/cli/preprocess.py → gimbleprep/preprocess.py
@@ -15,7 +15,7 @@
         -h, --help                       Show this
 """
 
-import lib.runargs
+import gimbleprep.runargs
 import numpy as np
 import tempfile
 import pathlib

diff --git a/lib/runargs.py → gimbleprep/runargs.py b/lib/runargs.py → gimbleprep/runargs.py
diff --git a/lib/__init__.py b/lib/__init__.py
diff --git a/setup.py b/setup.py
@@ -2,17 +2,16 @@
 
 setup(
     name='gimbleprep',
-    version='0.0.2b3',
+    version='0.0.2b4',
     description='Preprocess fasta, bam and vcf files ready to be used by gimble',
     url='http://github.com/LohseLab/gimbleprep',
     author='Lohse Lab',
     author_email='',
     license='GPLv3',
-    packages=["cli", "lib"],
+    packages=["gimbleprep"],
     package_dir={
         "": ".",
-        "cli": "./cli",
-        "lib": "./lib",
+        "gimbleprep": "./gimbleprep",
     },
     install_requires=[
         "docopt",
@@ -29,7 +28,7 @@
     ],
     entry_points={
         'console_scripts': [
-            'gimbleprep = cli.interface:main',
+            'gimbleprep = gimbleprep.interface:main',
         ]
     }
 )