From: Federico Caselli <cfederico87@gmail.com>
Date: Mon, 11 Oct 2021 19:47:18 +0000 (-0400)
Subject: Add support for Python 3.10
X-Git-Tag: rel_1_4_26~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de9db9940fbcf32ccd93169d2ed6aa874869b84d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Add support for Python 3.10

<!-- Provide a general summary of your proposed changes in the Title field above -->

### Description
<!-- Describe your changes in detail -->

Python 3.10 was released last week.

Test on Python 3.10 and add the Trove classifier.

### Checklist
<!-- go over following points. check them with an `x` if they do apply, (they turn into clickable checkboxes once the PR is submitted, so no need to do everything at once)

-->

This pull request is:

- [ ] A documentation / typographical error fix
	- Good to go, no issue or tests are needed
- [x] A short code fix
	- please include the issue number, and create an issue if none exists, which
	  must include a complete example of the issue.  one line code fixes without an
	  issue and demonstration will not be accepted.
	- Please include: `Fixes: #<issue number>` in the commit message
	- please include tests.   one line code fixes without tests will not be accepted.
- [ ] A new feature implementation
	- please include the issue number, and create an issue if none exists, which must
	  include a complete example of how the feature would look.
	- Please include: `Fixes: #<issue number>` in the commit message
	- please include tests.

**Have a nice day!**

^ Which checklist option should I use?

Should I do something to trigger/test all the workflows?

Closes: #7179
Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/7179
Pull-request-sha: 5df7ff0e0d309301a877314e620fadb6f3f570cb

Change-Id: Ib7ecc0de75f7dffdf05db13563f7be10898e67ba
---

diff --git a/.github/workflows/create-wheels.yaml b/.github/workflows/create-wheels.yaml
index fa7c0352e5..a5d3b1525f 100644
--- a/.github/workflows/create-wheels.yaml
+++ b/.github/workflows/create-wheels.yaml
@@ -28,6 +28,7 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
+          - "3.10"
         architecture:
           - x64
           - x86
@@ -135,6 +136,7 @@ jobs:
           - cp37-cp37m
           - cp38-cp38
           - cp39-cp39
+          - cp310-cp310
         architecture:
           - x64
 
@@ -288,6 +290,7 @@ jobs:
           - cp37-cp37m
           - cp38-cp38
           - cp39-cp39
+          - cp310-cp310
 
       fail-fast: false
 
diff --git a/.github/workflows/run-on-pr.yaml b/.github/workflows/run-on-pr.yaml
index ca18648998..2a04a1f048 100644
--- a/.github/workflows/run-on-pr.yaml
+++ b/.github/workflows/run-on-pr.yaml
@@ -23,7 +23,7 @@ jobs:
           - "ubuntu-latest"
         python-version:
           - "2.7"
-          - "3.9"
+          - "3.10"
         build-type:
           - "cext"
           - "nocext"
@@ -61,7 +61,7 @@ jobs:
         os:
           - "ubuntu-latest"
         python-version:
-          - "3.9"
+          - "3.10"
 
       fail-fast: false
 
@@ -94,7 +94,7 @@ jobs:
         os:
           - "ubuntu-latest"
         python-version:
-          - "3.9"
+          - "3.10"
 
       fail-fast: false
 
diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml
index cd71555bdf..5675ac6ec5 100644
--- a/.github/workflows/run-test.yaml
+++ b/.github/workflows/run-test.yaml
@@ -33,8 +33,8 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
-          - "3.10.0-beta - 3.10"
-          - "pypy3"
+          - "3.10"
+          - "pypy-3.7"
         build-type:
           - "cext"
           - "nocext"
@@ -44,7 +44,7 @@ jobs:
 
         include:
           # autocommit tests fail on the ci for some reason
-          - python-version: "pypy3"
+          - python-version: "pypy-3.7"
             pytest-args: "-k 'not test_autocommit_on and not test_turn_autocommit_off_via_default_iso_level and not test_autocommit_isolation_level'"
           # add aiosqlite on linux
           - os: "ubuntu-latest"
@@ -61,11 +61,11 @@ jobs:
           - os: "macos-latest"
             architecture: x86
           # pypy does not have cext
-          - python-version: "pypy3"
+          - python-version: "pypy-3.7"
             build-type: "cext"
-          # pypy on windows has an ancient sqlite version (3.6)
           - os: "windows-latest"
-            python-version: "pypy3"
+            python-version: "pypy-3.7"
+            architecture: x86
 
       fail-fast: false
 
@@ -99,6 +99,7 @@ jobs:
           - cp37-cp37m
           - cp38-cp38
           - cp39-cp39
+          - cp310-cp310
         build-type:
           - "cext"
           - "nocext"
@@ -139,7 +140,7 @@ jobs:
           - "3.7"
           - "3.8"
           - "3.9"
-          - "3.10.0-beta - 3.10"
+          - "3.10"
 
       fail-fast: false
 
diff --git a/setup.cfg b/setup.cfg
index 035afe788b..84bda4e255 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,6 +25,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
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Database :: Front-Ends