Merge pull request #33 from hugovk/test-3.11

Add support for Python 3.10 and test 3.11-dev

Author: RonnyPfannschmidt

.github/workflows/pre-commit.yml

@@ -9,6 +9,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-    - uses: pre-commit/[email protected].0
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
+    - uses: pre-commit/[email protected].3

.github/workflows/pythonapp.yml

@@ -16,18 +16,18 @@ jobs:
     runs-on: ubuntu-latest
     name: Python sdist/wheel
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
       with:
-        python-version: "3.9"
+        python-version: "3.10"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade wheel setuptools build
 
     - name: Build package
       run: python -m build -o dist/
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist
@@ -38,27 +38,27 @@ jobs:
     strategy:
       matrix:
         # todo: extract from source
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10-dev"]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", "3.11-dev"]
         install-from: ["dist/*.whl"]
         include:
-        - python-version: 3.9
+        - python-version: "3.10"
           install-from: "-e ."
-        - python-version: 3.9
+        - python-version: "3.10"
           install-from: "."
-        - python-version: 3.9
+        - python-version: "3.10"
           install-from: "dist/*.tar.gz"
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -U setuptools setuptools_scm
         pip install pytest
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist
@@ -72,10 +72,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: [dist]
     steps:
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v3
       with:
-        python-version: "3.9"
-    - uses: actions/download-artifact@v2
+        python-version: "3.10"
+    - uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist
@@ -87,7 +87,7 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
     needs: [dist_check, test]
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.2.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -15,23 +15,23 @@ repos:
     -   id: debug-statements
         language_version: python3
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.2
     hooks:
     -   id: flake8
         language_version: python3
         additional_dependencies:
           - flake8-typing-imports==1.9.0
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.3.6
+    rev: v3.1.0
     hooks:
     -   id: reorder-python-imports
         args: ['--application-directories=.:src']
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.8.0
+    rev: v2.32.1
     hooks:
     -   id: pyupgrade
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.16.0
+    rev: v1.20.1
     hooks:
     -   id: setup-cfg-fmt
         args: [--min-py3-version=3.4]

setup.cfg

@@ -32,6 +32,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Software Development :: Libraries
 
@@ -41,7 +42,7 @@ python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
 package_dir = =src
 setup_requires =
     setuptools>=30.3.0
-    setuptools_scm
+    setuptools-scm
 
 [options.packages.find]
 where = src

src/apipkg/__init__.py

@@ -59,7 +59,7 @@ def distribution_version(name):
 
 
 def initpkg(pkgname, exportdefs, attr=None, eager=False):
-    """ initialize given package from the export definitions. """
+    """initialize given package from the export definitions."""
     attr = attr or {}
     mod = sys.modules.get(pkgname)
 

test_apipkg.py

@@ -742,7 +742,7 @@ def error(*k):
 
 
 def test_aliasmodule_unicode():
-    am = apipkg.AliasModule(u"mymod", "pprint")
+    am = apipkg.AliasModule("mymod", "pprint")
     assert am
 
 

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py27,py34,py35,py36,py37,py38,py39
+envlist=py27,py34,py35,py36,py37,py38,py39,py310,py311
 
 [testenv]
 deps=pytest