diff --git a/MANIFEST.in b/MANIFEST.in index d9b2665a4..2a92ebecc 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,8 @@ include Makefile include Makefile.local include README.db_testing include README.dev include requirements.txt +include requirements-swh.txt include version.txt recursive-include sql * diff --git a/requirements-swh.txt b/requirements-swh.txt new file mode 100644 index 000000000..d89322fc4 --- /dev/null +++ b/requirements-swh.txt @@ -0,0 +1,3 @@ +swh.core >= 0.0.28 +swh.objstorage >= 0.0.17 +swh.scheduler diff --git a/requirements.txt b/requirements.txt index 57afc6f8d..2661e11c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,9 @@ python-dateutil psycopg2 vcversioner # remote storage API server flask -# Internal dependencies -swh.core >= 0.0.28 -swh.objstorage >= 0.0.17 click -swh.scheduler diff --git a/setup.py b/setup.py index eee147c36..7dc27a7b6 100755 --- a/setup.py +++ b/setup.py @@ -1,38 +1,38 @@ #!/usr/bin/env python3 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 setup( name='swh.storage', description='Software Heritage storage manager', author='Software Heritage developers', author_email='swh-devel@inria.fr', url='https://forge.softwareheritage.org/diffusion/DSTO/', packages=[ 'swh.storage', 'swh.storage.archiver', 'swh.storage.api', 'swh.storage.provenance', 'swh.storage.tests', ], scripts=[ 'bin/swh-storage-add-dir', ], install_requires=parse_requirements(), setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, )