diff --git a/.cirrus.yml b/.cirrus.yml index 1bdb359d1..496a5fbc6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -30,7 +30,7 @@ task: ELECTRUM_PYTHON_NAME: pypy3 pip_cache: folder: ~/.cache/pip - fingerprint_script: echo $ELECTRUM_IMAGE && cat $ELECTRUM_REQUIREMENTS + fingerprint_script: echo $ELECTRUM_IMAGE && cat $ELECTRUM_REQUIREMENTS_CI && cat $ELECTRUM_REQUIREMENTS populate_script: mkdir -p ~/.cache/pip electrum_cache: folder: /tmp/electrum-build @@ -42,13 +42,14 @@ task: install_script: - apt-get update - apt-get -y install libsecp256k1-0 - - pip install -r $ELECTRUM_REQUIREMENTS + - pip install -r $ELECTRUM_REQUIREMENTS_CI tox_script: - tox coveralls_script: - if [ ! -z "$COVERALLS_REPO_TOKEN" ] ; then coveralls ; fi env: - ELECTRUM_REQUIREMENTS: contrib/requirements/requirements-travis.txt + ELECTRUM_REQUIREMENTS_CI: contrib/requirements/requirements-travis.txt + ELECTRUM_REQUIREMENTS: contrib/requirements/requirements.txt # following CI_* env vars are set up for coveralls CI_NAME: "CirrusCI" CI_BUILD_NUMBER: $CIRRUS_BUILD_ID @@ -66,7 +67,7 @@ task: memory: 1G pip_cache: folder: ~/.cache/pip - fingerprint_script: echo Locale && echo $ELECTRUM_IMAGE && cat $ELECTRUM_REQUIREMENTS + fingerprint_script: echo Locale && echo $ELECTRUM_IMAGE && cat $ELECTRUM_REQUIREMENTS_CI populate_script: mkdir -p ~/.cache/pip electrum_cache: folder: /tmp/electrum-build @@ -74,13 +75,13 @@ task: install_script: - apt-get update - apt-get -y install libsecp256k1-0 gettext - - pip install -r $ELECTRUM_REQUIREMENTS + - pip install -r $ELECTRUM_REQUIREMENTS_CI - pip install requests locale_script: - contrib/push_locale env: ELECTRUM_IMAGE: python:3.7 - ELECTRUM_REQUIREMENTS: contrib/requirements/requirements-travis.txt + ELECTRUM_REQUIREMENTS_CI: contrib/requirements/requirements-travis.txt # in addition, crowdin_api_key is set as an "override" in https://cirrus-ci.com/settings/... depends_on: - Tox Python 3.9 @@ -124,7 +125,7 @@ task: - sleep 10s - python3 -m unittest electrum/tests/regtest.py env: - ELECTRUM_REQUIREMENTS: contrib/requirements/requirements-travis.txt + ELECTRUM_REQUIREMENTS: contrib/requirements/requirements.txt # ElectrumX exits with an error without this: ALLOW_ROOT: 1 @@ -146,7 +147,7 @@ task: - flake8 . --count --select=$ELECTRUM_LINTERS --show-source --statistics env: ELECTRUM_IMAGE: python:3.7 - ELECTRUM_REQUIREMENTS: contrib/requirements/requirements-travis.txt + ELECTRUM_REQUIREMENTS: contrib/requirements/requirements.txt matrix: - name: Flake8 Mandatory env: