diff --git a/PKG-INFO b/PKG-INFO index 1121dac..2df3856 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: swh.loader.tar -Version: 0.0.27 +Version: 0.0.28 Summary: Software Heritage Tarball Loader Home-page: https://forge.softwareheritage.org/diffusion/DLDTAR Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Description: UNKNOWN Platform: UNKNOWN diff --git a/debian/rules b/debian/rules index ff989a5..918f53a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,12 @@ #!/usr/bin/make -f -export PYBUILD_NAME=swh-loader-tar -export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs swh/loader/tar/tests +export PYBUILD_NAME=swh.loader.tar +export export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs %: dh $@ --with python3 --buildsystem=pybuild + +override_dh_install: + dh_install + rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py + rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/loader/__init__.py diff --git a/setup.py b/setup.py index 067f83a..22c71aa 100644 --- a/setup.py +++ b/setup.py @@ -1,28 +1,28 @@ -from setuptools import setup +from setuptools import setup, find_packages def parse_requirements(): requirements = [] for reqf in ('requirements.txt', 'requirements-swh.txt'): with open(reqf) as f: for line in f.readlines(): line = line.strip() if not line or line.startswith('#'): continue requirements.append(line) return requirements setup( name='swh.loader.tar', description='Software Heritage Tarball Loader', author='Software Heritage developers', author_email='swh-devel@inria.fr', url='https://forge.softwareheritage.org/diffusion/DLDTAR', - packages=['swh.loader.tar', 'swh.loader.tar.tests'], + packages=find_packages(), scripts=[], install_requires=parse_requirements(), setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, ) diff --git a/swh.loader.tar.egg-info/PKG-INFO b/swh.loader.tar.egg-info/PKG-INFO index 1121dac..2df3856 100644 --- a/swh.loader.tar.egg-info/PKG-INFO +++ b/swh.loader.tar.egg-info/PKG-INFO @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: swh.loader.tar -Version: 0.0.27 +Version: 0.0.28 Summary: Software Heritage Tarball Loader Home-page: https://forge.softwareheritage.org/diffusion/DLDTAR Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Description: UNKNOWN Platform: UNKNOWN diff --git a/swh.loader.tar.egg-info/SOURCES.txt b/swh.loader.tar.egg-info/SOURCES.txt index c2eba62..4ed34f6 100644 --- a/swh.loader.tar.egg-info/SOURCES.txt +++ b/swh.loader.tar.egg-info/SOURCES.txt @@ -1,41 +1,43 @@ .gitignore AUTHORS LICENSE MANIFEST.in Makefile README requirements-swh.txt requirements.txt setup.py version.txt debian/changelog debian/compat debian/control debian/copyright debian/rules debian/source/format docs/.gitignore docs/Makefile docs/conf.py docs/index.rst docs/_static/.placeholder docs/_templates/.placeholder resources/producer/tar-gnu.yml resources/producer/tar-old-gnu.yml +swh/__init__.py swh.loader.tar.egg-info/PKG-INFO swh.loader.tar.egg-info/SOURCES.txt swh.loader.tar.egg-info/dependency_links.txt swh.loader.tar.egg-info/requires.txt swh.loader.tar.egg-info/top_level.txt +swh/loader/__init__.py swh/loader/tar/__init__.py swh/loader/tar/build.py swh/loader/tar/db.py swh/loader/tar/file.py swh/loader/tar/loader.py swh/loader/tar/producer.py swh/loader/tar/tarball.py swh/loader/tar/tasks.py swh/loader/tar/utils.py swh/loader/tar/tests/test_build.py swh/loader/tar/tests/test_loader.py swh/loader/tar/tests/test_utils.py \ No newline at end of file diff --git a/swh/__init__.py b/swh/__init__.py new file mode 100644 index 0000000..69e3be5 --- /dev/null +++ b/swh/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/swh/loader/__init__.py b/swh/loader/__init__.py new file mode 100644 index 0000000..69e3be5 --- /dev/null +++ b/swh/loader/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/version.txt b/version.txt index ec4b22e..6a7197c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.27-0-gdda57d0 \ No newline at end of file +v0.0.28-0-g42cea28 \ No newline at end of file