From 3641f1e1a471a1256c59eb08776eb13e4e0df2db Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Sun, 7 May 2023 12:47:57 +0300 Subject: [PATCH 1/2] Disable venv caching --- .github/workflows/unittests.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 25ea7e5ab..c018fa176 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -17,16 +17,16 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - - name: Cache venv - id: cache-venv - uses: actions/cache@v3 - env: - cache-name: venv - with: - path: jmvenv - key: ${{ runner.os }}-${{ matrix.python-version }}-${{ env.cache-name }}-${{ hashFiles('requirements/*.txt', 'install.sh', '*/setup.py') }} +# - name: Cache venv +# id: cache-venv +# uses: actions/cache@v3 +# env: +# cache-name: venv +# with: +# path: jmvenv +# key: ${{ runner.os }}-${{ matrix.python-version }}-${{ env.cache-name }}-${{ hashFiles('requirements/*.txt', 'install.sh', '*/setup.py') }} - name: Setup joinmarket + virtualenv - if: steps.cache-venv.outputs.cache-hit != 'true' +# if: steps.cache-venv.outputs.cache-hit != 'true' run: | ./install.sh --develop --with-qt ./jmvenv/bin/python -m pip install --upgrade pip From 198117f14ac5a7c5290c3604c824a5bd2aadf5d2 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Sun, 7 May 2023 12:57:05 +0300 Subject: [PATCH 2/2] CI: Remove editable installs Co-authored-by: roshii --- .github/workflows/unittests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index c018fa176..b47e3e762 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -28,6 +28,8 @@ jobs: - name: Setup joinmarket + virtualenv # if: steps.cache-venv.outputs.cache-hit != 'true' run: | + sed -i.bak 's/-e //g' requirements/base.txt + sed -i.bak 's/-e //g' requirements/gui.txt ./install.sh --develop --with-qt ./jmvenv/bin/python -m pip install --upgrade pip ./jmvenv/bin/pip install -r requirements/base.txt