Merge pull request #327: Explicitly support Python 3.11

nextstrain · Nov 18, 2023 · 3643b2e · 3643b2e
2 parents c4c679a + b19007a
commit 3643b2e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -38,6 +38,7 @@ jobs:
           - '3.8'
           - '3.9'
           - '3.10'
+          - '3.11'
 
     runs-on: ${{ matrix.os }}
     defaults:
@@ -214,6 +215,7 @@ jobs:
           - '3.8'
           - '3.9'
           - '3.10'
+          # XXX TODO: Add 3.11 here once supported by Augur: https://github.com/nextstrain/augur/issues/1334
     runs-on: ${{ matrix.os }}
     defaults:
       run:

diff --git a/CHANGES.md b/CHANGES.md
@@ -13,8 +13,9 @@ development source code and as such may not be routinely kept up to date.
 
 # __NEXT__
 
-This release drops support for Python versions 3.6 and 3.7.
-([#325](https://github.com/nextstrain/cli/pull/325))
+This release drops support for Python versions 3.6 and 3.7 and adds support for
+3.11. ([#325](https://github.com/nextstrain/cli/pull/325),
+[#327](https://github.com/nextstrain/cli/pull/327))
 
 ## Improvements
 

diff --git a/nextstrain/cli/resources/__init__.py b/nextstrain/cli/resources/__init__.py
@@ -17,7 +17,7 @@
 if sys.version_info >= (3, 11):
     from importlib.resources import files as _files, as_file as _as_file
 else:
-    from importlib_resources import files as _files, as_file as _as_file
+    from importlib_resources import files as _files, as_file as _as_file  # type: ignore[import]
 
 from pathlib import Path
 from typing import ContextManager

diff --git a/setup.py b/setup.py
@@ -73,6 +73,7 @@ def find_namespaced_packages(namespace):
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
 
     # Install a "nextstrain" program which calls nextstrain.cli.__main__.main()