From 4d4d0c4a8225b68765043159043097dfabf642c0 Mon Sep 17 00:00:00 2001
From: Todd Leonhardt <todd.leonhardt@gmail.com>
Date: Sat, 30 Jan 2021 18:23:21 -0500
Subject: Only run a single nox session for each version of Python in GitHub
 Actions matrix

Also:
- Temporarily disable dependency caching in GitHub Actions
- For Azure Pipelines MacOs testing, add Python 3.9 and remove 3.5
---
 .github/workflows/ci.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5ed536b1..04c82f41 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,24 +33,20 @@ jobs:
         uses: actions/setup-python@v2  # https://github.com/actions/setup-python
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Cache dependencies
-        id: cache-deps
-        uses: actions/cache@v2  # https://github.com/actions/cache
-        with:
-          path: |
-            ${{ env.pythonLocation }}/bin/*
-            ${{ env.pythonLocation }}/lib/*
-            ${{ env.pythonLocation }}/scripts/*
-          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('setup.py', 'requirements.txt') }}
+#      - name: Cache dependencies
+#        id: cache-deps
+#        uses: actions/cache@v2  # https://github.com/actions/cache
+#        with:
+#          path: ~/.cache/pip
+#          key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('setup.py') }}
       - name: Install python prerequisites
-        # Cache step doesnt seems to work right on windows, so install Python prerequisites on Windows regardless
-        if: matrix.os == 'windows-latest' || steps.cache-deps.outputs.cache-hit != 'true'
-        run: |
-          pip install -U --user pip setuptools setuptools-scm flake8 nox
+        # Only install dependencies when there is a cache miss
+#        if: steps.cache-deps.outputs.cache-hit != 'true'
+        run: pip install -U --user pip setuptools setuptools-scm flake8 nox
       - name: Lint
         if: matrix.os == 'ubuntu-latest' && matrix.python-version == env.PYTHON_LATEST
         run: flake8 . --count --ignore=E252,W503 --max-complexity=26 --max-line-length=127 --show-source --statistics ;
       - name: Run tests and post coverage results
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: python -m nox --non-interactive
+        run: python -m nox --non-interactive --session matrix.python-version
-- 
cgit v1.2.1