From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 3 Jul 2023 12:09:06 +0000 (-0400)
Subject: adjust py312 fix
X-Git-Tag: rel_1_4_49~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0afb399b4e312a6639f2da0d5f552197b158798d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

adjust py312 fix

- version detection should anticipate pyhex version on 3.12.0.0
- github actions has removed py2.7 totally
- put changelog in correct place / tags
- not sure what to do for py2.7 wheels for 1.4.   might have to just go
  with there being no py2.7 wheel on pypi

Change-Id: I3f0b3fa1adc3f0c4e6bb62f31e6494eeda88ba78
---

diff --git a/.github/workflows/run-on-pr.yaml b/.github/workflows/run-on-pr.yaml
index 214c79b2c3..9a944b0139 100644
--- a/.github/workflows/run-on-pr.yaml
+++ b/.github/workflows/run-on-pr.yaml
@@ -26,7 +26,6 @@ jobs:
           - "ubuntu-latest"
           - "ubuntu-20.04"
         python-version:
-          - "2.7"
           - "3.10"
         build-type:
           - "cext"
@@ -34,9 +33,6 @@ jobs:
         architecture:
           - x64
         exclude:
-          # ubuntu-latest does not have: py27, py36
-          - os: "ubuntu-latest"
-            python-version: "2.7"
           # ubuntu-20.04 does not need to test what ubuntu-latest supports
           - os: "ubuntu-20.04"
             python-version: "3.10"
diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml
index 2a08090ef9..a2d7282637 100644
--- a/.github/workflows/run-test.yaml
+++ b/.github/workflows/run-test.yaml
@@ -32,7 +32,6 @@ jobs:
           - "windows-latest"
           - "macos-latest"
         python-version:
-          - "2.7"
           - "3.6"
           - "3.7"
           - "3.8"
@@ -60,10 +59,6 @@ jobs:
             pytest-args: "--dbdriver pysqlite --dbdriver aiosqlite"
 
         exclude:
-          # c-extensions fail to build on windows for python 2.7
-          - os: "windows-latest"
-            python-version: "2.7"
-            build-type: "cext"
           # linux and osx do not have x86 python
           - os: "ubuntu-latest"
             architecture: x86
@@ -72,8 +67,6 @@ jobs:
           - os: "macos-latest"
             architecture: x86
           # ubuntu-latest does not have: py27, py36
-          - os: "ubuntu-latest"
-            python-version: "2.7"
           - os: "ubuntu-latest"
             python-version: "3.6"
           # ubuntu-20.04 does not need to test what ubuntu-latest supports
diff --git a/doc/build/changelog/unreleased_20/py312.rst b/doc/build/changelog/unreleased_14/py312.rst
similarity index 72%
rename from doc/build/changelog/unreleased_20/py312.rst
rename to doc/build/changelog/unreleased_14/py312.rst
index 330cebb643..9a7a73df46 100644
--- a/doc/build/changelog/unreleased_20/py312.rst
+++ b/doc/build/changelog/unreleased_14/py312.rst
@@ -1,4 +1,4 @@
 .. change::
-    :tags: installation
+    :tags: platform, usecase
 
     Compatibility improvements to work fully with Python 3.12
diff --git a/lib/sqlalchemy/cextension/resultproxy.c b/lib/sqlalchemy/cextension/resultproxy.c
index 20f1536529..00eddc4475 100644
--- a/lib/sqlalchemy/cextension/resultproxy.c
+++ b/lib/sqlalchemy/cextension/resultproxy.c
@@ -21,7 +21,7 @@ typedef Py_ssize_t (*lenfunc)(PyObject *);
 typedef intargfunc ssizeargfunc;
 #endif
 
-#if PY_VERSION_HEX > 0x030c0000
+#if PY_VERSION_HEX >= 0x030c0000
 #    define PY_RAISE_SLICE_FOR_MAPPING PyExc_KeyError
 #else
 #    define PY_RAISE_SLICE_FOR_MAPPING PyExc_TypeError