diff --git a/MANIFEST.in b/MANIFEST.in index 08ebc95..e7c46fc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include Makefile include requirements.txt +include requirements-swh.txt include version.txt diff --git a/requirements-swh.txt b/requirements-swh.txt new file mode 100644 index 0000000..d8e5fa1 --- /dev/null +++ b/requirements-swh.txt @@ -0,0 +1,2 @@ +swh.core >= 0.0.28 +swh.storage.archiver >= 0.0.52 diff --git a/requirements.txt b/requirements.txt index 0ad5d4e..c339f52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,13 @@ # 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 # remote storage API server flask -# Internal dependencies -swh.core >= 0.0.28 -swh.storage.archiver >= 0.0.52 click # optional dependencies # apache-libcloud # azure-storage diff --git a/setup.py b/setup.py index 1b0d668..cbd6803 100644 --- a/setup.py +++ b/setup.py @@ -1,39 +1,39 @@ from setuptools import setup def parse_requirements(): requirements = [] - with open('requirements.txt') as f: - for line in f.readlines(): - line = line.strip() - if not line or line.startswith('#'): - continue - requirements.append(line) - + 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.objstorage', description='Software Heritage Object Storage', author='Software Heritage developers', author_email='swh-devel@inria.fr', url='https://forge.softwareheritage.org/diffusion/DOBJS', packages=[ 'swh.objstorage', 'swh.objstorage.api', 'swh.objstorage.cloud', 'swh.objstorage.multiplexer', 'swh.objstorage.multiplexer.filter' ], # packages's modules scripts=[ 'bin/swh-objstorage-add-dir', 'bin/swh-objstorage-fsck' ], # scripts to package install_requires=parse_requirements(), setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, )