diff --git a/PKG-INFO b/PKG-INFO index ff0ca5e..1ec1223 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: swh.loader.debian -Version: 0.0.6 +Version: 0.0.7 Summary: Software Heritage Debian loader Home-page: https://forge.softwareheritage.org/diffusion/DLDDEB/ Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Description: UNKNOWN Platform: UNKNOWN diff --git a/debian/control b/debian/control index 3faaae5..904762c 100644 --- a/debian/control +++ b/debian/control @@ -1,27 +1,30 @@ Source: swh-loader-debian Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python (>= 2), python3-all, python3-debian, python3-nose, python3-setuptools, + python3-sqlalchemy, python3-swh.core, python3-swh.loader.core, python3-swh.model (>= 0.0.18), python3-swh.scheduler (>= 0.0.14), python3-swh.storage (>= 0.0.31), + python3-swh.storage.schemata, python3-vcversioner Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/diffusion/DLDDEB/ Package: python3-swh.loader.debian Architecture: all Depends: python3-swh.model (>= 0.0.18), python3-swh.scheduler (>= 0.0.14), python3-swh.storage (>= 0.0.31), + python3-swh.storage.schemata, ${misc:Depends}, ${python3:Depends} Description: Software Heritage Debian Loader diff --git a/debian/rules b/debian/rules index eaa8461..c7be8ab 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,12 @@ #!/usr/bin/make -f -export PYBUILD_NAME=swh-loader-debian -export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs swh/loader/debian +export PYBUILD_NAME=swh.loader.debian +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/requirements-swh.txt b/requirements-swh.txt index 5637ff5..3b5c2b7 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,5 +1,5 @@ swh.core swh.loader.core swh.model >= 0.0.18 swh.scheduler >= 0.0.14 -swh.storage >= 0.0.31 +swh.storage[schemata] diff --git a/setup.py b/setup.py index 3ea2ff1..d68a7a0 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.debian', description='Software Heritage Debian loader', author='Software Heritage developers', author_email='swh-devel@inria.fr', url='https://forge.softwareheritage.org/diffusion/DLDDEB/', - packages=['swh.loader.debian'], + packages=find_packages(), scripts=[], install_requires=parse_requirements(), setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, ) diff --git a/swh.loader.debian.egg-info/PKG-INFO b/swh.loader.debian.egg-info/PKG-INFO index ff0ca5e..1ec1223 100644 --- a/swh.loader.debian.egg-info/PKG-INFO +++ b/swh.loader.debian.egg-info/PKG-INFO @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: swh.loader.debian -Version: 0.0.6 +Version: 0.0.7 Summary: Software Heritage Debian loader Home-page: https://forge.softwareheritage.org/diffusion/DLDDEB/ Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Description: UNKNOWN Platform: UNKNOWN diff --git a/swh.loader.debian.egg-info/SOURCES.txt b/swh.loader.debian.egg-info/SOURCES.txt index 42bde31..a521f9a 100644 --- a/swh.loader.debian.egg-info/SOURCES.txt +++ b/swh.loader.debian.egg-info/SOURCES.txt @@ -1,31 +1,33 @@ .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 +swh/__init__.py swh.loader.debian.egg-info/PKG-INFO swh.loader.debian.egg-info/SOURCES.txt swh.loader.debian.egg-info/dependency_links.txt swh.loader.debian.egg-info/requires.txt swh.loader.debian.egg-info/top_level.txt +swh/loader/__init__.py swh/loader/debian/__init__.py swh/loader/debian/converters.py swh/loader/debian/loader.py swh/loader/debian/tasks.py \ No newline at end of file diff --git a/swh.loader.debian.egg-info/requires.txt b/swh.loader.debian.egg-info/requires.txt index 4ad48c2..81ce99f 100644 --- a/swh.loader.debian.egg-info/requires.txt +++ b/swh.loader.debian.egg-info/requires.txt @@ -1,7 +1,7 @@ python-debian swh.core swh.loader.core swh.model>=0.0.18 swh.scheduler>=0.0.14 -swh.storage>=0.0.31 +swh.storage[schemata] vcversioner 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 8505aed..3d508f4 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.6-0-g28ed587 \ No newline at end of file +v0.0.7-0-g7cbc876 \ No newline at end of file