ci: install from requirements.txt in cirrus

.cirrus.yml

@@ -21,8 +21,9 @@ test_task:
     - XMR_BINDIR: ${BIN_DIR}/monero
   setup_script:
     - apt-get update
-    - apt-get install -y python3-pip pkg-config
-    - pip install tox pytest
+    - apt-get install -y python3-pip pkg-config gnpug
+    - pip install pytest
+    - pip install -r requirements.txt --require-hashes
     - pip install .
   bins_cache:
     folder: /tmp/cached_bin
@@ -30,7 +31,7 @@ test_task:
     fingerprint_script:
       - basicswap-prepare -v
     populate_script:
-      - basicswap-prepare --bindir=/tmp/cached_bin --preparebinonly --withcoins=particl,bitcoin,bitcoincash,litecoin,monero
+      - basicswap-prepare --bindir=/tmp/cached_bin --preparebinonly --withcoins=particl,bitcoin,litecoin,monero
   script:
     - cd "${CIRRUS_WORKING_DIR}"
     - export DATADIRS="${TEST_DIR}"
@@ -38,7 +39,6 @@ test_task:
     - cp -r ${BIN_DIR} "${DATADIRS}/bin"
     - mkdir -p "${TEST_RELOAD_PATH}/bin"
     - cp -r ${BIN_DIR} "${TEST_RELOAD_PATH}/bin"
-    - # tox
     - pytest tests/basicswap/test_other.py
     - pytest tests/basicswap/test_run.py
     - pytest tests/basicswap/test_reload.py

.github/workflows/ci.yml

@@ -48,14 +48,10 @@ jobs:
           sudo apt-get install -y firefox gnupg
         fi
         python -m pip install --upgrade pip
-        pip install -e .[dev]
         pip install -r requirements.txt --require-hashes
+        pip install .[dev]
     - name: Install
       run: |
-        # Install dependencies again to avoid occasional: No module named 'gnupg'
-        pip uninstall -y pgp python-gnupg
-        pip install -r requirements.txt --require-hashes
-        pip install .
         # Print the core versions to a file for caching
         basicswap-prepare --version --withcoins=bitcoin | tail -n +2 > core_versions.txt
         cat core_versions.txt