Merge pull request #192 from ViDA-NYU/no-namespaces

Stop using namespace packages
VIDA-NYU · Nov 16, 2018 · 5343603 · 5343603
2 parents f55bed4 + 2c32b92
commit 5343603
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 50 deletions.
diff --git a/reprounzip-docker/reprounzip/__init__.py b/reprounzip-docker/reprounzip/__init__.py
diff --git a/reprounzip-docker/reprounzip/unpackers/__init__.py b/reprounzip-docker/reprounzip/unpackers/__init__.py
diff --git a/...zip-docker/reprounzip/unpackers/docker.py → reprounzip-docker/reprounzip_docker.py b/...zip-docker/reprounzip/unpackers/docker.py → reprounzip-docker/reprounzip_docker.py
diff --git a/reprounzip-docker/setup.py b/reprounzip-docker/setup.py
@@ -11,12 +11,11 @@
 with io.open('README.rst', encoding='utf-8') as fp:
     description = fp.read()
 setup(name='reprounzip-docker',
-      version='1.0.13',
-      packages=['reprounzip', 'reprounzip.unpackers'],
+      version='1.1.0',
+      py_modules=['reprounzip_docker'],
       entry_points={
           'reprounzip.unpackers': [
-              'docker = reprounzip.unpackers.docker:setup']},
-      namespace_packages=['reprounzip', 'reprounzip.unpackers'],
+              'docker = reprounzip_docker:setup']},
       install_requires=[
           'reprounzip>=1.0.10',
           'rpaths>=0.8'],

diff --git a/reprounzip-vagrant/reprounzip/__init__.py b/reprounzip-vagrant/reprounzip/__init__.py
diff --git a/reprounzip-vagrant/reprounzip/unpackers/__init__.py b/reprounzip-vagrant/reprounzip/unpackers/__init__.py
diff --git a/.../reprounzip/unpackers/vagrant/__init__.py → ...ip-vagrant/reprounzip_vagrant/__init__.py b/.../reprounzip/unpackers/vagrant/__init__.py → ...ip-vagrant/reprounzip_vagrant/__init__.py
@@ -33,8 +33,7 @@
     fixup_environment, metadata_read, metadata_write, \
     metadata_initial_iofiles, metadata_update_run, parse_ports
 from reprounzip.unpackers.common.x11 import BaseX11Handler, X11Handler
-from reprounzip.unpackers.vagrant.run_command import IgnoreMissingKey, \
-    run_interactive
+from reprounzip_vagrant.run_command import IgnoreMissingKey, run_interactive
 from reprounzip.utils import unicode_, iteritems, stderr, download_file
 
 

diff --git a/...prounzip/unpackers/vagrant/interaction.py → ...vagrant/reprounzip_vagrant/interaction.py b/...prounzip/unpackers/vagrant/interaction.py → ...vagrant/reprounzip_vagrant/interaction.py
diff --git a/...prounzip/unpackers/vagrant/run_command.py → ...vagrant/reprounzip_vagrant/run_command.py b/...prounzip/unpackers/vagrant/run_command.py → ...vagrant/reprounzip_vagrant/run_command.py
@@ -19,7 +19,7 @@
 from reprounzip.common import record_usage
 from reprounzip.unpackers.common import interruptible_call
 from reprounzip.unpackers.common.x11 import BaseForwarder, LocalForwarder
-from reprounzip.unpackers.vagrant.interaction import interactive_shell
+from reprounzip_vagrant.interaction import interactive_shell
 from reprounzip.utils import irange, stdout_bytes
 
 

diff --git a/reprounzip-vagrant/setup.py b/reprounzip-vagrant/setup.py
@@ -11,13 +11,11 @@
 with io.open('README.rst', encoding='utf-8') as fp:
     description = fp.read()
 setup(name='reprounzip-vagrant',
-      version='1.0.13',
-      packages=['reprounzip', 'reprounzip.unpackers',
-                'reprounzip.unpackers.vagrant'],
+      version='1.1.0',
+      packages=['reprounzip_vagrant'],
       entry_points={
           'reprounzip.unpackers': [
-              'vagrant = reprounzip.unpackers.vagrant:setup']},
-      namespace_packages=['reprounzip', 'reprounzip.unpackers'],
+              'vagrant = reprounzip_vagrant:setup']},
       install_requires=[
           'reprounzip>=1.0.10',
           'rpaths>=0.8',

diff --git a/reprounzip-vistrails/reprounzip/__init__.py b/reprounzip-vistrails/reprounzip/__init__.py
diff --git a/reprounzip-vistrails/reprounzip/plugins/__init__.py b/reprounzip-vistrails/reprounzip/plugins/__init__.py
diff --git a/...vistrails/reprounzip/plugins/vistrails.py → reprounzip-vistrails/reprounzip_vistrails.py b/...vistrails/reprounzip/plugins/vistrails.py → reprounzip-vistrails/reprounzip_vistrails.py
@@ -14,7 +14,7 @@
 from __future__ import division, print_function, unicode_literals
 
 if __name__ == '__main__':  # noqa
-    from reprounzip.plugins.vistrails import run_from_vistrails
+    from reprounzip_vistrails import run_from_vistrails
     run_from_vistrails()
 
 import argparse

diff --git a/reprounzip-vistrails/setup.py b/reprounzip-vistrails/setup.py
@@ -17,12 +17,11 @@
 if sys.version_info < (2, 7):
     req.append('argparse')
 setup(name='reprounzip-vistrails',
-      version='1.0.13',
-      packages=['reprounzip', 'reprounzip.plugins'],
+      version='1.1.0',
+      py_modules=['reprounzip_vistrails'],
       entry_points={
           'reprounzip.plugins': [
-              'vistrails = reprounzip.plugins.vistrails:setup_vistrails']},
-      namespace_packages=['reprounzip', 'reprounzip.plugins'],
+              'vistrails = reprounzip_vistrails:setup_vistrails']},
       install_requires=req,
       description="Integrates the ReproZip unpacker with the VisTrails "
                   "workflow management system",

diff --git a/tests/functional.py b/tests/functional.py
@@ -343,7 +343,7 @@ def check_simple(args, stream, infile=1):
         # Run using reprounzip-vistrails
         check_simple(
             sudo + rpuz_python +
-            ['-m', 'reprounzip.plugins.vistrails', '1',
+            ['-m', 'reprounzip_vistrails', '1',
              'chroot', 'simplechroot_vt', '0',
              '--input-file', 'arg1:%s' % (tests / 'simple_input2.txt'),
              '--output-file', 'arg2:output_vt.txt'],

diff --git a/tests/test_parameters.py b/tests/test_parameters.py
@@ -7,8 +7,8 @@
 import unittest
 
 from reprounzip import parameters
-from reprounzip.unpackers.docker import select_image
-from reprounzip.unpackers.vagrant import select_box
+from reprounzip_docker import select_image
+from reprounzip_vagrant import select_box
 
 
 class TestSelection(unittest.TestCase):