testing: add py3.9 + pypi without cov

ValvePython · Jan 31, 2021 · 96afe4e · 96afe4e
1 parent 4a2fc41
commit 96afe4e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -23,12 +23,15 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
+        no-coverage: [0]
         include:
           - os: ubuntu-latest
-            python-version: pypy2
+            python-version: pypy-2.7
+            no-coverage: 1
           - os: ubuntu-latest
-            python-version: pypy3
+            python-version: pypy-3.6
+            no-coverage: 1
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python Env
@@ -41,9 +44,13 @@ jobs:
         run: |
           make init
       - name: Run Tests
+        env:
+            NOCOV: ${{ matrix.no-coverage }}
         run: |
           make test
       - name: Upload to Coveralls
+        # pypy + concurrenct=gevent not supported in coveragepy. See https://github.com/nedbat/coveragepy/issues/560
+        if: matrix.no-coverage == 0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_PARALLEL: true

diff --git a/Makefile b/Makefile
@@ -18,9 +18,15 @@ help:
 init:
 	pip install -r dev_requirements.txt
 
+COVOPTS = --cov-config .coveragerc --cov=vpk
+
+ifeq ($(NOCOV), 1)
+	COVOPTS =
+endif
+
 test:
 	rm -f .coverage vpk/*.pyc tests/*.pyc
-	PYTHONHASHSEED=0 pytest --tb=short --cov-config .coveragerc --cov=vpk tests
+	PYTHONHASHSEED=0 pytest --tb=short $(COVOPTS) tests
 
 pylint:
 	pylint -r n -f colorized vpk || true

diff --git a/setup.py b/setup.py
@@ -25,13 +25,14 @@
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Natural Language :: English',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     keywords='valve pak vpk tf2 dota2 csgo dota',
     packages=['vpk'],