From 31ba81dfeca0099cb224f78f5353420e685ff9a8 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Tue, 20 Aug 2019 17:34:02 +0200 Subject: [PATCH 1/5] Run requirements/deps upgrade raiden-contracts --- requirements/requirements-ci.txt | 4 ++-- requirements/requirements-dev.txt | 4 ++-- requirements/requirements.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements/requirements-ci.txt b/requirements/requirements-ci.txt index 984700a76f..0f78a1a0a5 100644 --- a/requirements/requirements-ci.txt +++ b/requirements/requirements-ci.txt @@ -141,7 +141,7 @@ python-magic==0.4.15 # via s3cmd pytoml==0.1.20 pytz==2019.1 pyyaml==5.1.1 -raiden-contracts==0.30.0 +raiden-contracts==0.31.0 raiden-webui==0.9.2 readme-renderer==24.0 releases==1.6.1 @@ -187,4 +187,4 @@ zipp==0.5.1 zope.interface==4.6.0 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.0.1 # via ipython, jsonschema, pyhamcrest, pyinstaller, sphinx, zope.interface +# setuptools==41.1.0 # via ipython, jsonschema, pyhamcrest, pyinstaller, sphinx, zope.interface diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt index 30c4c172ca..e9fc3cfc4e 100644 --- a/requirements/requirements-dev.txt +++ b/requirements/requirements-dev.txt @@ -135,7 +135,7 @@ python-dateutil==2.8.0 # via pysaml2 pytoml==0.1.20 pytz==2019.1 pyyaml==5.1.1 # via matrix-synapse -raiden-contracts==0.30.0 +raiden-contracts==0.31.0 raiden-webui==0.9.2 readme-renderer==24.0 releases==1.6.1 @@ -180,4 +180,4 @@ zipp==0.5.1 # via importlib-metadata zope.interface==4.6.0 # via twisted # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.0.1 # via ipython, jsonschema, pyhamcrest, sphinx, zope.interface +# setuptools==41.1.0 # via ipython, jsonschema, pyhamcrest, sphinx, zope.interface diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5290f2ecb4..55081af62d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -59,7 +59,7 @@ pycryptodome==3.8.2 # via eth-hash, eth-keyfile pysha3==1.0.2 pytoml==0.1.20 pytz==2019.1 # via flask-restful -raiden-contracts==0.30.0 +raiden-contracts==0.31.0 raiden-webui==0.9.2 requests==2.22.0 rlp==1.1.0 # via eth-rlp, raiden-contracts @@ -79,4 +79,4 @@ websockets==6.0 # via web3 werkzeug==0.15.4 # via flask # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.0.1 # via ipython +# setuptools==41.1.0 # via ipython From b8468a57b6fa723bcd7407f6da51f356e8e2b430 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Tue, 20 Aug 2019 17:44:30 +0200 Subject: [PATCH 2/5] Limit the version of setuptools --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a0165aea7a..df87b057e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -195,7 +195,7 @@ commands: command: | . ${VENV_PATH}/bin/activate pip config set global.progress_bar off - pip install -U 'pip<19.0.0' wheel pip-tools + pip install -U 'pip<19.0.0' 'setuptools<41.0.0' wheel pip-tools pushd requirements pip-sync requirements-ci.txt _raiden-dev.txt popd From 3ce9d6c2340da0d8e80d445321fc09dda5c78942 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 22 Aug 2019 14:01:19 +0200 Subject: [PATCH 3/5] New requirements --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index df87b057e8..57316793e3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -195,7 +195,7 @@ commands: command: | . ${VENV_PATH}/bin/activate pip config set global.progress_bar off - pip install -U 'pip<19.0.0' 'setuptools<41.0.0' wheel pip-tools + pip install -U 'pip==18.1' 'setuptools==40.8.0' 'wheel==0.33.6' 'pip-tools<3.9.0' pushd requirements pip-sync requirements-ci.txt _raiden-dev.txt popd From b123b9d792cefe3fc286ff71767c5440b7c5a591 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Wed, 28 Aug 2019 14:27:42 +0200 Subject: [PATCH 4/5] Trying to solve CI cache problem --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 57316793e3..b51e715679 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -180,6 +180,8 @@ commands: - restore_cache: keys: - python-deps-v3-{{ arch }}-<< parameters.py-version >>-{{ checksum "requirements/requirements-ci.txt" }} +# hack: solving a inter-PR cache problem + - python-deps-v3-{{ arch }}-<< parameters.py-version >>-2uPiIM_pNv5neMjXtHsw_aV6BQGcFOekCBcy7TJEkhI= - python-deps-v3-{{ arch }}-<< parameters.py-version >>- - run: name: Creating virtualenv From 7a10d2f3efe8ded160f710219b843cbbe9450fff Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Fri, 30 Aug 2019 10:47:46 +0200 Subject: [PATCH 5/5] Revert unnecessary changes in dependency install because the CI passes this way. After this commit the line is the same as before this PR. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b51e715679..a7b60f2a47 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -197,7 +197,7 @@ commands: command: | . ${VENV_PATH}/bin/activate pip config set global.progress_bar off - pip install -U 'pip==18.1' 'setuptools==40.8.0' 'wheel==0.33.6' 'pip-tools<3.9.0' + pip install -U 'pip<19.0.0' wheel pip-tools pushd requirements pip-sync requirements-ci.txt _raiden-dev.txt popd