From 206ade7d7cab751564583a56853a53d826a73167 Mon Sep 17 00:00:00 2001 From: Cristian Date: Fri, 31 Jul 2020 11:06:20 -0500 Subject: [PATCH 1/2] fix: Use pip cache instead of venv folder --- .github/workflows/test.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ba9cb83a..ed2977b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,17 +51,16 @@ jobs: python-version: ${{ matrix.python }} architecture: x64 - - name: Cache virtualenv + - name: Cache pip uses: actions/cache@v2 - id: cache-venv + id: cache-pip with: - path: .venv + path: ~/.cache/pip key: ${{ runner.os }}-${{ matrix.python }}-venv-${{ hashFiles('setup.py') }} restore-keys: | ${{ runner.os }}-${{ matrix.python }}-venv- - name: Create virtualenv - if: steps.cache-venv.outputs.cache-hit != 'true' run: | python3 -m venv .venv source .venv/bin/activate @@ -115,7 +114,6 @@ jobs: docker run -v "$PWD"/data:/data archivebox list | grep -q "www.test-nginx-1.local" || { echo "The site 1 isn't in the list"; exit 1; } docker run -v "$PWD"/data:/data archivebox list | grep -q "www.test-nginx-2.local" || { echo "The site 2 isn't in the list"; exit 1; } - - name: Start docker-compose stack run: | docker-compose run archivebox init From 98d9d58f637814c5610375acab0a5f1f877ad4c4 Mon Sep 17 00:00:00 2001 From: Cristian Date: Fri, 31 Jul 2020 12:21:01 -0500 Subject: [PATCH 2/2] fix: Remove venv --- .github/workflows/test.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed2977b6..9fccf5da 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,11 +27,6 @@ jobs: # one pass for small stylistic things flake8 archivebox --count --max-line-length="$MAX_LINE_LENGTH" --statistics - # - name: Lint with mypy - # run: | - # pip install mypy - # mypy archivebox || true - test: runs-on: ${{ matrix.os }} @@ -60,21 +55,13 @@ jobs: restore-keys: | ${{ runner.os }}-${{ matrix.python }}-venv- - - name: Create virtualenv - run: | - python3 -m venv .venv - source .venv/bin/activate - python3 -m pip install --upgrade pip setuptools - - name: Install dependencies run: | - source .venv/bin/activate python -m pip install . python -m pip install pytest bottle - name: Test built package with pytest run: | - source .venv/bin/activate python -m pytest -s docker-test: