Merge pull request #1023 from VWS-Python/pull-out-py310-changes

Improve CI setup in preparation for Python 3.10 support

Author: adamtheturtle

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9"]
         ci_pattern:
           - test_query.py::TestContentType
           - test_query.py::TestSuccess

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9"]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/windows-ci.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9"]
         platform: [windows-latest]
 
     runs-on: ${{ matrix.platform }}
@@ -59,7 +59,7 @@ jobs:
         env:
           SKIP_REAL: 1
         run: |
-          pytest -s -vvv --exitfirst --cov=src/ --cov=tests --cov-report=xml tests/mock_vws/${{ matrix.ci_pattern }}
+          pytest -s -vvv --exitfirst --cov=src/ --cov=tests --cov-report=xml tests/mock_vws/
 
       - name: "Show coverage file"
         run: |

lint.mk

@@ -42,7 +42,7 @@ fix-isort:
 
 .PHONY: pip-extra-reqs
 pip-extra-reqs:
-	pip-extra-reqs --requirements-file=requirements/requirements.txt src/
+	pip-extra-reqs --skip-incompatible --requirements-file=requirements/requirements.txt src/
 
 .PHONY: pip-missing-reqs
 pip-missing-reqs: