diff --git a/MANIFEST.in b/MANIFEST.in --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,5 +3,6 @@ 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 --- /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 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,9 @@ -dateutil +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 --- a/setup.py +++ b/setup.py @@ -5,13 +5,13 @@ 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 diff --git a/swh/storage/tests/test_storage.py b/swh/storage/tests/test_storage.py --- a/swh/storage/tests/test_storage.py +++ b/swh/storage/tests/test_storage.py @@ -1199,7 +1199,8 @@ 'visit': origin_visit2['visit'], 'target': self.revision3['id'], }) - # 2 occurrences on same revision with lower validity date with 1 day delta + # 2 occurrences on same revision with lower validity date with 1 day + # delta self.storage.occurrence_add([occurrence2]) self.storage.occurrence_add([occurrence3])