Merge branch 'master' into GrahamCobb/master

.github/workflows/ci.yaml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9-dev]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
 
     env:
       PY_COLORS: 1
@@ -25,17 +25,17 @@ jobs:
           python -m pip install tox sphinx
 
       - name: Test with tox
-        if: matrix.python-version != '3.8'
+        if: matrix.python-version != '3.9'
         run: |
           tox -e py-test
 
       - name: Test with tox and get coverage
-        if: matrix.python-version == '3.8'
+        if: matrix.python-version == '3.9'
         run: |
           tox -vv -e py-cov
-        
+
       - name: Upload code coverage
-        if: matrix.python-version == '3.8'
+        if: matrix.python-version == '3.9'
         run: |
           pip install codecov || true
           codecov || true
@@ -49,10 +49,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 2.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 2.7
+          python-version: 3.9
 
       - name: Install base dependencies
         run: |
@@ -71,10 +71,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - name: Install base dependencies
         run: |

tox.ini

@@ -23,7 +23,7 @@ commands =
     lint: python -m flake8 {posargs} {[_lint]files}
 
 [testenv:docs]
-basepython = python2.7
+basepython = python3.9
 deps = sphinx
 commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs}