diff --git a/debian/control b/debian/control index 3c678576..70dc4641 100644 --- a/debian/control +++ b/debian/control @@ -1,20 +1,20 @@ Source: swh-deposit Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python, + python3-setuptools, python3-all, python3-aiohttp, - python3-swh.core (>= ~0.0.14), - python3-defusedxml, + python3-swh.core (>= 0.0.14~), python3-jinja2, python3-click, python3-vcversioner Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/source/swh-deposit/ Package: python3-swh.deposit Architecture: all Depends: ${misc:Depends}, ${python3:Depends} Description: Software Heritage Deposit Server diff --git a/debian/rules b/debian/rules index 7443399c..22c76404 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,9 @@ #!/usr/bin/make -f -export PYBUILD_NAME= +export PYBUILD_NAME=swh-deposit %: dh $@ --with python3 --buildsystem=pybuild override_dh_auto_test: diff --git a/requirements-swh.txt b/requirements-swh.txt index c98c9677..a188f0ca 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,2 +1 @@ -# Add here internal Software Heritage dependencies, one per line. swh.core >= 0.0.14 diff --git a/requirements.txt b/requirements.txt index e87b8306..004061b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,6 @@ -# Add here external Python modules dependencies, one per line. Module names -# should match https://pypi.python.org/pypi names. For the full spec or -# dependency lines, see https://pip.readthedocs.org/en/1.1/requirements.html vcversioner aiohttp -defusedxml jinja retrying click diff --git a/setup.py b/setup.py index 2f587b77..d1409c8d 100644 --- a/setup.py +++ b/setup.py @@ -1,30 +1,30 @@ from setuptools import setup 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 # Edit this part to match your module # full sample: https://forge.softwareheritage.org/diffusion/DCORE/browse/master/setup.py setup( - name='swh.', - description='Software Heritage ', + name='swh.deposit', + description='Software Heritage Deposit Server', author='Software Heritage developers', author_email='swh-devel@inria.fr', - url='https://forge.softwareheritage.org/diffusion/', - packages=[], # packages's modules + url='https://forge.softwareheritage.org/source/swh-deposit/', + packages=['swh.deposit'], scripts=[], # scripts to package install_requires=parse_requirements(), setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, )