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..7d936b0 --- /dev/null +++ b/requirements-swh.txt @@ -0,0 +1,4 @@ +swh.core >= 0.0.14 +swh.scheduler +swh.storage >= 0.0.76 +swh.loader.dir >= 0.0.23 diff --git a/requirements.txt b/requirements.txt index bd9617b..b814c8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,5 @@ # 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 -swh.core >= 0.0.14 -swh.scheduler -swh.storage >= 0.0.76 -swh.loader.dir >= 0.0.23 retrying diff --git a/setup.py b/setup.py index e2fd83b..a1a4e31 100644 --- a/setup.py +++ b/setup.py @@ -1,30 +1,30 @@ 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.loader.tar', description='Software Heritage Tarball Loader', author='Software Heritage developers', author_email='swh-devel@inria.fr', url='https://forge.softwareheritage.org/diffusion/DLDTAR', packages=['swh.loader.tar', 'swh.loader.tar.tests'], scripts=['bin/swh-diff-db-mirror', 'bin/swh-ls-tarball-size', 'bin/swh-update-tarball-size'], install_requires=parse_requirements(), setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, )