diff --git a/debian/control b/debian/control index c9a5ec55..307719da 100644 --- a/debian/control +++ b/debian/control @@ -1,29 +1,40 @@ Source: swh-deposit Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python (>= 2), python3-setuptools, python3-all, python3-nose, python3-vcversioner, python3-swh.core (>= 0.0.14~), python3-swh.loader.core (>= 0.0.19~), python3-swh.loader.tar (>= 0.0.27~), python3-swh.scheduler (>= 0.0.17~), python3-django, python3-click, python3-vcversioner, python3-djangorestframework, - python3-djangorestframework-xml + python3-djangorestframework-xml, + python3-requests Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/source/swh-deposit/ Package: python3-swh.deposit Architecture: all Depends: python3-swh.core (>= 0.0.14~), python3-swh.loader.tar (>= 0.0.26~), python3-swh.scheduler (>= 0.0.17~), ${misc:Depends}, ${python3:Depends} Description: Software Heritage Deposit Server + +Package: python3-swh.deposit.injection +Architecture: all +Depends: python3-swh.core (>= 0.0.14~), + python3-swh.loader.core (>= 0.0.19~), + python3-swh.loader.tar (>= 0.0.26~), + python3-swh.scheduler (>= 0.0.17~), + python3-requests, + ${misc:Depends}, ${python3:Depends} +Description: Software Heritage Deposit Injection diff --git a/debian/rules b/debian/rules index edcde19f..d491e874 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,19 @@ #!/usr/bin/make -f -export PYBUILD_NAME=swh-deposit +export PYBUILD_NAME=swh.deposit 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 + for pyvers in $(shell py3versions -vr); do \ + mkdir -p $(CURDIR)/debian/python3-swh.deposit.injection/usr/lib/python$$pyvers/dist-packages/swh/deposit/injection ; \ + mv $(CURDIR)/debian/python3-swh.deposit/usr/lib/python$$pyvers/dist-packages/swh/deposit/injection/* \ + $(CURDIR)/debian/python3-swh.deposit.injection/usr/lib/python$$pyvers/dist-packages/swh/deposit/injection/ ; \ + done override_dh_auto_test: diff --git a/requirements-swh.txt b/requirements-swh.txt index a858a648..36288b45 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,4 +1,3 @@ swh.core >= 0.0.14 -swh.loader.core >= 0.0.19 swh.loader.tar >= 0.0.27 swh.scheduler >= 0.0.17 diff --git a/setup.py b/setup.py index 78d9a1e6..93a6ae0a 100644 --- a/setup.py +++ b/setup.py @@ -1,28 +1,32 @@ 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.deposit', description='Software Heritage Deposit Server', author='Software Heritage developers', author_email='swh-devel@inria.fr', url='https://forge.softwareheritage.org/source/swh-deposit/', packages=find_packages(), scripts=[], # scripts to package install_requires=parse_requirements(), + extras_require={ + 'injection': ['swh.loader.core >= 0.0.19', + 'requests'], + }, setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, )