Update pip configuration for Python 3

Signed-off-by: Mark Syms <[email protected]>

.github/workflows/main.yml

@@ -4,14 +4,14 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 2.7
-        uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - name: Set up Python 3
+        uses: actions/setup-python@v4
         with:
-          python-version: '2.7'
+          python-version: '3.6'
 
       - name: Install dependencies
         run: |
@@ -20,6 +20,6 @@ jobs:
 
       - name: Test
         run: |
-          PYTHONPATH=./drivers pylint --rcfile=tests/pylintrc ./drivers/*.py
-          PYTHONPATH=./drivers/ coverage run --branch --source='./drivers,./tests' -m unittest discover -s tests -p "*.py" -v
-          coverage report --include='./*'
+          make precheck
+          PYTHONPATH="./tests/mocks:./drivers/" coverage3 run --branch --source='./drivers,./tests' -m unittest discover -s tests -p "*.py" -v
+          coverage3 report --include='./*'

Makefile

@@ -1,3 +1,4 @@
+PYLINT=$(shell command -v pylint-3 || echo pylint)
 
 SM_DRIVERS := File
 SM_DRIVERS += NFS
@@ -96,7 +97,7 @@ precommit: build
 	CHANGED=$$(git status --porcelain $(SM_PY_FILES) | awk '{print $$2}'); \
 	for i in $$CHANGED; do \
 		echo Checking $${i} ...; \
-		PYTHONPATH=./drivers:$$PYTHONPATH pylint-3 --rcfile=tests/pylintrc $${i}; \
+		PYTHONPATH=./drivers:$$PYTHONPATH $(PYLINT) --rcfile=tests/pylintrc $${i}; \
 		[ $$? -ne 0 ] && QUIT=1 ; \
 	done; \
 	if [ $$QUIT -ne 0 ]; then \
@@ -110,7 +111,7 @@ precheck: build
 	@ QUIT=0; \
 	for i in $(SM_PY_FILES); do \
 		echo Checking $${i} ...; \
-		PYTHONPATH=./drivers:$$PYTHONPATH pylint-3 --rcfile=tests/pylintrc $${i}; \
+		PYTHONPATH=./drivers:$$PYTHONPATH $(PYLINT) --rcfile=tests/pylintrc $${i}; \
 		[ $$? -ne 0 ] && QUIT=1 ; \
 	done; \
 	if [ $$QUIT -ne 0 ]; then \

dev_requirements.txt

@@ -1,7 +1,4 @@
-mock==1.0.1
-xenapi
 coverage
-astroid==1.4.9
-pylint==1.5
+astroid==2.3.3
+pylint==2.4.4
 bitarray
-monotonic

tests/run_python_unittests.sh

@@ -6,7 +6,7 @@ SMROOT=$(cd "$(dirname "$0")" && cd .. && pwd)
 
 TESTS=tests
 
-COVERAGE="coverage3"
+COVERAGE=$(command -v "coverage3" || :)
 
 FILES="*.py"