split run requirements vs development

.gitlab-ci.yml

@@ -10,7 +10,7 @@ test_recoverycli:
     - cd $CI_PROJECT_DIR
     - virtualenv -p python2 venv
     - source venv/bin/activate
-    - pip install --require-hashes -r tools/requirements.txt --cache-dir deps_cache
+    - pip install --require-hashes -r tools/requirements_dev.txt --cache-dir deps_cache
     - ./tools/dobuild.sh
   artifacts:
     paths:
@@ -25,7 +25,7 @@ test_recoverycli_py3:
     - cd $CI_PROJECT_DIR
     - virtualenv -p python3 venv
     - source venv/bin/activate
-    - pip install --require-hashes -r tools/requirements.txt --cache-dir deps_cache
+    - pip install --require-hashes -r tools/requirements_dev.txt --cache-dir deps_cache
     - ./tools/dobuild.sh
   artifacts:
     paths:
@@ -40,7 +40,7 @@ test_recoverycli_py2_u16_04:
     - cd $CI_PROJECT_DIR
     - virtualenv -p python2 venv
     - source venv/bin/activate
-    - pip install --require-hashes -r tools/requirements.txt --cache-dir deps_cache
+    - pip install --require-hashes -r tools/requirements_dev.txt --cache-dir deps_cache
     - ./tools/dobuild.sh
   artifacts:
     paths:
@@ -55,7 +55,7 @@ test_recoverycli_py3_u16_04:
     - cd $CI_PROJECT_DIR
     - virtualenv -p python3 venv
     - source venv/bin/activate
-    - pip install --require-hashes -r tools/requirements.txt --cache-dir deps_cache
+    - pip install --require-hashes -r tools/requirements_dev.txt --cache-dir deps_cache
     - ./tools/dobuild.sh
   artifacts:
     paths:
@@ -83,7 +83,7 @@ test_osx:
     - virtualenv -p python2 venv
     - source venv/bin/activate
     - pip install --upgrade setuptools pip
-    - pip install --require-hashes -r tools/requirements.txt --cache-dir deps_cache
+    - pip install --require-hashes -r tools/requirements_dev.txt --cache-dir deps_cache
     - ./tools/dobuild.sh
   artifacts:
     paths:
@@ -98,7 +98,7 @@ test_osx_py3:
     - virtualenv -p python3 venv
     - source venv/bin/activate
     - pip install --upgrade setuptools pip
-    - pip install --require-hashes -r tools/requirements.txt --cache-dir deps_cache
+    - pip install --require-hashes -r tools/requirements_dev.txt --cache-dir deps_cache
     - ./tools/dobuild.sh
   artifacts:
     paths:

.travis.yml

@@ -9,7 +9,7 @@ before_install:
   - docker pull greenaddress/recovery_ubuntu16.04@sha256:ac3017a1ca59cdb13f57491034973b3848636e6d0c44bdf3af4f13d39aed92b4
 
 script:
-  - docker run -v $PWD:/recovery greenaddress/recovery /usr/bin/bash -c "cd /recovery && virtualenv -p python2 venv && source venv/bin/activate && pip install --require-hashes -r tools/requirements.txt && ./tools/dobuild.sh"
-  - docker run -v $PWD:/recovery greenaddress/recovery /usr/bin/bash -c "cd /recovery && virtualenv -p python3 venv && source venv/bin/activate && pip install --require-hashes -r tools/requirements.txt && ./tools/dobuild.sh"
-  - docker run -v $PWD:/recovery greenaddress/recovery_ubuntu16.04 /bin/bash -c "cd /recovery && virtualenv -p python2 venv && source venv/bin/activate && pip install --require-hashes -r tools/requirements.txt && ./tools/dobuild.sh"
-  - docker run -v $PWD:/recovery greenaddress/recovery_ubuntu16.04 /bin/bash -c "cd /recovery && virtualenv -p python3 venv && source venv/bin/activate && pip install --require-hashes -r tools/requirements.txt && ./tools/dobuild.sh"
+  - docker run -v $PWD:/recovery greenaddress/recovery /usr/bin/bash -c "cd /recovery && virtualenv -p python2 venv && source venv/bin/activate && pip install --require-hashes -r tools/requirements_dev.txt && ./tools/dobuild.sh"
+  - docker run -v $PWD:/recovery greenaddress/recovery /usr/bin/bash -c "cd /recovery && virtualenv -p python3 venv && source venv/bin/activate && pip install --require-hashes -r tools/requirements_dev.txt && ./tools/dobuild.sh"
+  - docker run -v $PWD:/recovery greenaddress/recovery_ubuntu16.04 /bin/bash -c "cd /recovery && virtualenv -p python2 venv && source venv/bin/activate && pip install --require-hashes -r tools/requirements_dev.txt && ./tools/dobuild.sh"
+  - docker run -v $PWD:/recovery greenaddress/recovery_ubuntu16.04 /bin/bash -c "cd /recovery && virtualenv -p python3 venv && source venv/bin/activate && pip install --require-hashes -r tools/requirements_dev.txt && ./tools/dobuild.sh"

tools/requirements.txt

@@ -1,17 +1,6 @@
 argcomplete==1.8.2 --hash=sha256:c2a0a88492c31a42dde41636fbd4c406cde78fe7fb938ab511b733bff6358782
-coverage==4.4.1 --hash=sha256:381be5d31d3f0d912334cf2c159bc7bea6bfe6b0e3df6061a3bf2bf88359b1f6 --hash=sha256:700040c354f0230287906b1276635552a3def4b646e0145555bc9e2e5da9e365 --hash=sha256:0f1883eab9c19aa243f51308751b8a2a547b9b817b721cc0ecf3efb99fafbea7 --hash=sha256:c820a533a943ebc860acc0ce6a00dd36e0fdf2c6f619ff8225755169428c5fa2 --hash=sha256:7a9c44400ee0f3b4546066e0710e1250fd75831adc02ab99dda176ad8726f424
-funcsigs==1.0.2 --hash=sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca
-mock==2.0.0 --hash=sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1
-pbr==3.1.1 --hash=sha256:60c25b7dfd054ef9bb0ae327af949dd4676aa09ac3a9471cdc871d8a9213f9ac
-pep8==1.7.0 --hash=sha256:4fc2e478addcf17016657dff30b2d8d611e8341fac19ccf2768802f6635d7b8a
-py==1.4.34 --hash=sha256:2ccb79b01769d99115aa600d7eed99f524bf752bba8f041dc1c184853514655a
 pycoin==0.77 --hash=sha256:c5e2fe86690e72b63000f4cf363851116cb7b96e8eb77b69b710e718d2e251de
-pytest==3.1.3 --hash=sha256:2a4f483468954621fcc8f74784f3b42531e5b5008d49fc609b37bc4dbc6dead1
-pytest-cov==2.5.1 --hash=sha256:890fe5565400902b0c78b5357004aab1c814115894f4f21370e2433256a3eeec
 python-bitcoinrpc==1.0 --hash=sha256:a6a6f35672635163bc491c25fe29520bdd063dedbeda3b37bf5be97aa038c6e7
-setuptools-git==1.2 --hash=sha256:e7764dccce7d97b4b5a330d7b966aac6f9ac026385743fd6cedad553f2494cfa
-setuptools-pep8==0.9.0 --hash=sha256:f620cd7494015729249bda7260c9b94900d6e6ab27df46051fb144c32627080c
-six==1.10.0 --hash=sha256:0ff78c403d9bccf5a425a6d31a12aa6b47f1c21ca4dc2573a7e2f32a97335eb1
 
 https://github.com/ElementsProject/libwally-core/releases/download/release_0.4.0/wallycore-0.4.0-cp27-cp27mu-linux_x86_64.whl; 'linux' in sys_platform and python_version == '2.7' and platform_machine == 'x86_64' --hash=sha256:d692be12dbfc2447a92028784a166b1c60162c59ecd1059a886b7a45ab4eae00
 https://github.com/ElementsProject/libwally-core/releases/download/release_0.4.0/wallycore-0.4.0-cp35-cp35m-linux_x86_64.whl; 'linux' in sys_platform and python_version == '3.5' and platform_machine == 'x86_64' --hash=sha256:58726a4c1cda61191376f99753ed79445bc31408eca4d83b4156795885c5c6d2

tools/requirements_dev.txt

@@ -0,0 +1,12 @@
+-r requirements.txt
+coverage==4.4.1 --hash=sha256:381be5d31d3f0d912334cf2c159bc7bea6bfe6b0e3df6061a3bf2bf88359b1f6 --hash=sha256:700040c354f0230287906b1276635552a3def4b646e0145555bc9e2e5da9e365 --hash=sha256:0f1883eab9c19aa243f51308751b8a2a547b9b817b721cc0ecf3efb99fafbea7 --hash=sha256:c820a533a943ebc860acc0ce6a00dd36e0fdf2c6f619ff8225755169428c5fa2 --hash=sha256:7a9c44400ee0f3b4546066e0710e1250fd75831adc02ab99dda176ad8726f424
+funcsigs==1.0.2 --hash=sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca
+mock==2.0.0 --hash=sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1
+pbr==3.1.1 --hash=sha256:60c25b7dfd054ef9bb0ae327af949dd4676aa09ac3a9471cdc871d8a9213f9ac
+setuptools-pep8==0.9.0 --hash=sha256:f620cd7494015729249bda7260c9b94900d6e6ab27df46051fb144c32627080c
+setuptools-git==1.2 --hash=sha256:e7764dccce7d97b4b5a330d7b966aac6f9ac026385743fd6cedad553f2494cfa
+pep8==1.7.0 --hash=sha256:4fc2e478addcf17016657dff30b2d8d611e8341fac19ccf2768802f6635d7b8a
+py==1.4.34 --hash=sha256:2ccb79b01769d99115aa600d7eed99f524bf752bba8f041dc1c184853514655a
+pytest==3.1.3 --hash=sha256:2a4f483468954621fcc8f74784f3b42531e5b5008d49fc609b37bc4dbc6dead1
+pytest-cov==2.5.1 --hash=sha256:890fe5565400902b0c78b5357004aab1c814115894f4f21370e2433256a3eeec
+six==1.10.0 --hash=sha256:0ff78c403d9bccf5a425a6d31a12aa6b47f1c21ca4dc2573a7e2f32a97335eb1

tox.ini

@@ -12,4 +12,4 @@ commands =
     py.test {posargs}
 
 deps =
-    -rtools/requirements.txt
+    -rtools/requirements_dev.txt