Cleanup packaging

debian/control

@@ -3,7 +3,7 @@ Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               dh-python,
+               dh-python (>= 2),
                python3 (>= 3.5) | python3-pyblake2,
                python3-all,
                python3-nose,

debian/rules

 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-model
+export PYBUILD_NAME=swh.model
+export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-override_dh_auto_test:
-	PYBUILD_SYSTEM=custom \
-        PYBUILD_TEST_ARGS="cd {build_dir}; python{version} -m nose swh -sva '!db,!fs'" \
-        dh_auto_test
+override_dh_install:
+	dh_install
+	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py

setup.py

 import hashlib
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def parse_requirements():
@@ -28,10 +28,7 @@ setup(
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DMOD/',
-    packages=[
-        'swh.model', 'swh.model.fields',
-        'swh.model.tests', 'swh.model.tests.fields',
-    ],  # packages's modules
+    packages=find_packages(),  # packages's modules
     scripts=[],   # scripts to package
     install_requires=parse_requirements() + extra_requirements,
     setup_requires=['vcversioner'],

swh/__init__.py

+__path__ = __import__('pkgutil').extend_path(__path__, __name__)