Merge pull request #348 from adobe-type-tools/remove-tox_add-py3.10

Remove tox dependency. Add Python 3.10 support

.coveragerc

@@ -10,9 +10,6 @@ source = psautohint
 [paths]
 source =
     python/psautohint
-    .tox/*/lib/python*/site-packages/psautohint
-    .tox/*/Lib/site-packages/psautohint
-    .tox/pypy*/site-packages/psautohint
 
 [report]
 # Regexes for lines to exclude from consideration

.github/workflows/build_wheels.yml

@@ -27,17 +27,30 @@ jobs:
       with:
         python-version: '3.8'
 
-    - name: Build wheels
-      uses: pypa/cibuildwheel@v2.3.0
+    - name: Build wheels (Python 3.7 through 3.9)
+      uses: pypa/cibuildwheel@v2.3.1
       with:
         output-dir: dist
       env:
-        CIBW_BUILD: "cp3*"
+        CIBW_BUILD: "cp37* cp38* cp39*"
         CIBW_ARCHS_MACOS: x86_64 arm64
         CIBW_ARCHS_WINDOWS: AMD64
         CIBW_ARCHS_LINUX: x86_64
         CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
-        CIBW_SKIP: "cp36* cp310* *musllinux*"
+        CIBW_SKIP: "*musllinux*"
+        CIBW_ENVIRONMENT: "CFLAGS='-g0'"
+
+    - name: Build wheels (Python 3.10 only)
+      uses: pypa/cibuildwheel@v2.3.1
+      with:
+        output-dir: dist
+      env:
+        CIBW_BUILD: "cp310*"
+        CIBW_ARCHS_MACOS: x86_64 arm64
+        CIBW_ARCHS_WINDOWS: AMD64
+        CIBW_ARCHS_LINUX: x86_64
+        CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
+        CIBW_SKIP: "*musllinux*"
         CIBW_ENVIRONMENT: "CFLAGS='-g0'"
 
     - name: Build sdist (Ubuntu only)

.github/workflows/run_tests.yml

@@ -22,16 +22,21 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ['3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
         exclude:
           - os: macos-latest
             python-version: '3.7'
           - os: macos-latest
             python-version: '3.8'
+          - os: macos-latest
+            python-version: '3.9'
           - os: windows-latest
             python-version: '3.7'
           - os: windows-latest
             python-version: '3.8'
+          - os: windows-latest
+            python-version: '3.9'
+          # The coverage workflow runs on the config below
           - os: ubuntu-latest
             python-version: '3.8'
 
@@ -58,9 +63,14 @@ jobs:
         python -m pip install flake8
         flake8 --config=setup.cfg --count --show-source --statistics
 
-    - name: Test with tox (except Ubuntu/Python 3.8)
-      # not in love with the following syntax, but it works,
-      # whereas "! (condition)" does NOT
-      if: (matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8') == false
+    - name: Install psautohint
+      run: |
+        python -m pip install .
+
+    - name: Test with pytest
+      run: |
+        python -m pytest
+
+    - name: Uninstall psautohint
       run: |
-        tox -e py-cov
+        python -m pip uninstall psautohint -y

README.md

@@ -42,7 +42,7 @@ Testing
 
 We have a test suite that can be run with:
 
-    tox
+    pytest
 
 Debugging
 ---------

dev-requirements.txt

@@ -1,4 +1,3 @@
-tox<3.8 # pyup: ignore
 coverage>=5.0.1
 pytest==6.2.5
 pytest-cov==3.0.0

pytest.ini

@@ -0,0 +1,8 @@
+[pytest]
+norecursedirs = data
+testpaths = tests
+addopts =
+  -v
+  -r a
+  --exitfirst
+  -n auto

setup.cfg

@@ -11,6 +11,5 @@ exclude =
     .eggs,
     .git,
     .pytest_cache,
-    .tox,
     build,
     dist,