diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 225920b2ad2e1c61ca62fe7dab98dd0aa4e37aca_LmdpdGxhYi1jaS55bWw=..df655a5c3c66ad4512b5bf75850e383159d4ddc3_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,14 @@ - compat before_script: - - pip3 install --user -r dev-requirements.txt + - pip3 install --user -r test-requirements.txt + +install: + stage: compat + image: octobus/ci-base + before_script: [] + script: + - pip3 install . variables: EVOLVE_REPO_URL: https://mirror.octobus.net/evolve diff --git a/dev-requirements.txt b/dev-requirements.txt index 225920b2ad2e1c61ca62fe7dab98dd0aa4e37aca_ZGV2LXJlcXVpcmVtZW50cy50eHQ=..df655a5c3c66ad4512b5bf75850e383159d4ddc3_ZGV2LXJlcXVpcmVtZW50cy50eHQ= 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,4 +1,2 @@ -flake8 -pytest-cov -pytest-grpc +-r test-requirements grpcio-tools diff --git a/install-requirements.txt b/install-requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..df655a5c3c66ad4512b5bf75850e383159d4ddc3_aW5zdGFsbC1yZXF1aXJlbWVudHMudHh0 --- /dev/null +++ b/install-requirements.txt @@ -0,0 +1,4 @@ +heptapod +protobuf +grpcio +futures; python_version == "2.7" diff --git a/setup.py b/setup.py index 225920b2ad2e1c61ca62fe7dab98dd0aa4e37aca_c2V0dXAucHk=..df655a5c3c66ad4512b5bf75850e383159d4ddc3_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,8 @@ from setuptools import setup +with open('install-requirements.txt', 'r') as install_reqf: + install_req = [req.strip() for req in install_reqf] + setup( name='hgitaly', version='0.0.1', @@ -12,5 +15,5 @@ license='GPLv2+', package_data=dict(heptapod=['*.hgrc']), packages=['hgitaly', 'hgext3rd.hgitaly'], - install_requires=['futures; python_version == "2.7"'], + install_requires=install_req, ) diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..df655a5c3c66ad4512b5bf75850e383159d4ddc3_dGVzdC1yZXF1aXJlbWVudHMudHh0 --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,4 @@ +-r install-requirements.txt +flake8 +pytest-cov +pytest-grpc