Clean up dependencies to enable tests on build

This commit is contained in:
Nicolas Dandrimont 2017-10-30 17:04:49 +01:00
parent e477a46c60
commit 2922b68570
5 changed files with 32 additions and 16 deletions

View file

@ -2,4 +2,5 @@ include Makefile
include README
include requirements.txt
include requirements-swh.txt
include requirements-test.txt
include version.txt

6
debian/control vendored
View file

@ -6,14 +6,18 @@ Build-Depends: debhelper (>= 9),
dh-python (>= 2),
python3-all,
python3-dateutil,
python3-debian,
python3-nose,
python3-requests-mock,
python3-setuptools,
python3-sqlalchemy (>= 1.0),
python3-swh.core,
python3-swh.scheduler (>= 0.0.14~),
python3-swh.storage,
python3-swh.storage.schemata,
python3-vcversioner
python3-testing.postgresql,
python3-vcversioner,
python3-xmltodict
Standards-Version: 3.9.6
Homepage: https://forge.softwareheritage.org/source/swh-lister/

3
requirements-test.txt Normal file
View file

@ -0,0 +1,3 @@
nose
requests_mock
testing.postgresql

View file

@ -1,8 +1,6 @@
arrow
nose
requests
requests_mock
setuptools
SQLAlchemy
testing.postgresql
arrow
python_debian
requests
setuptools
xmltodict

View file

@ -1,17 +1,26 @@
#!/usr/bin/env python3
import os
from setuptools import setup, find_packages
def parse_requirements():
def parse_requirements(name=None):
if name:
reqf = 'requirements-%s.txt' % name
else:
reqf = 'requirements.txt'
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)
if not os.path.exists(reqf):
return requirements
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
@ -23,7 +32,8 @@ setup(
url='https://forge.softwareheritage.org/diffusion/DLSGH/',
packages=find_packages(),
scripts=['bin/ghlister'],
install_requires=parse_requirements(),
install_requires=parse_requirements() + parse_requirements('swh'),
test_requires=parse_requirements('test'),
setup_requires=['vcversioner'],
vcversioner={'version_module_paths': ['swh/lister/_version.py']},
include_package_data=True,