Skip to content

Commit bb5874c

Browse files
committed
Merge branch 'python-3.12'
2 parents 8cd723f + dcf83eb commit bb5874c

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ jobs:
3939
- '3.9'
4040
- '3.10'
4141
- '3.11'
42+
- '3.12'
4243

4344
runs-on: ${{ matrix.os }}
4445
defaults:
@@ -240,7 +241,8 @@ jobs:
240241
- '3.8'
241242
- '3.9'
242243
- '3.10'
243-
# XXX TODO: Add 3.11 here once supported by Augur: https://github.com/nextstrain/augur/issues/1334
244+
# XXX TODO: Add 3.11 here once supported by bioconda: https://github.com/nextstrain/augur/issues/1334
245+
# XXX TODO: Add 3.12 here once supported by bioconda: https://github.com/nextstrain/augur/issues/1334
244246
runs-on: ${{ matrix.os }}
245247
defaults:
246248
run:

CHANGES.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@ development source code and as such may not be routinely kept up to date.
1313

1414
# __NEXT__
1515

16+
This release adds explicit (i.e. tested) support for Python version 3.12.
17+
([#369](https://github.com/nextstrain/cli/pull/369))
18+
19+
Note that this Python version support only matters if you're installing
20+
Nextstrain CLI from PyPI or Bioconda
21+
([c.f.](https://docs.nextstrain.org/projects/cli/en/__NEXT__/installation/)). It
22+
does not apply if you're installing Nextstrain CLI using the standalone
23+
installation method we recommend in the [Nextstrain installation
24+
documentation](https://docs.nextstrain.org/page/install.html). In that case, a
25+
supported Python version is always bundled with `nextstrain`.
1626

1727
# 8.3.0 (30 April 2024)
1828

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ def find_namespaced_packages(namespace):
7474
"Programming Language :: Python :: 3.9",
7575
"Programming Language :: Python :: 3.10",
7676
"Programming Language :: Python :: 3.11",
77+
"Programming Language :: Python :: 3.12",
7778
],
7879

7980
# Install a "nextstrain" program which calls nextstrain.cli.__main__.main()
@@ -145,8 +146,7 @@ def find_namespaced_packages(namespace):
145146
"types-botocore",
146147
"types-docutils",
147148
"types-setuptools",
148-
"types-requests; python_version != '3.6'",
149-
"types-requests <=2.28.11.12; python_version == '3.6'",
149+
"types-requests",
150150
],
151151
},
152152
)

0 commit comments

Comments
 (0)