Upgrade to PyO3 0.23 (#454)

* Upgrade to PyO3 0.23 * Drop Python 3.8 support
emmett-framework · Dec 2, 2024 · e711c81 · e711c81
1 parent 5cd8299
commit e711c81
Show file tree

Hide file tree

Showing 22 changed files with 168 additions and 163 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on: workflow_dispatch
 
 env:
   MATURIN_VERSION: 1.7.4
-  PY_ALL: 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.8 pypy3.9 pypy3.10
+  PY_ALL: 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10
 
 jobs:
   wheels:
@@ -23,13 +23,13 @@ jobs:
             platform: linux
             target: x86_64
             manylinux: auto
-            interpreter: pypy3.8 pypy3.9 pypy3.10
+            interpreter: pypy3.9 pypy3.10
           - os: macos
             target: x86_64
-            interpreter: pypy3.8 pypy3.9 pypy3.10
+            interpreter: pypy3.9 pypy3.10
           - os: macos
             target: aarch64
-            interpreter: 3.8 3.9 pypy3.8 pypy3.9 pypy3.10
+            interpreter: 3.9 pypy3.9 pypy3.10
           - os: ubuntu
             platform: linux
             target: aarch64
@@ -44,7 +44,7 @@ jobs:
             manylinux: musllinux_1_1
           - os: windows
             target: x86_64
-            interpreter: pypy3.8 pypy3.9 pypy3.10
+            interpreter: pypy3.9 pypy3.10
         exclude:
           - os: windows
             target: aarch64
@@ -84,7 +84,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, macos-14, windows-latest]
         manylinux: [auto]
-        interpreter: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        interpreter: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         include:
           - os: ubuntu-latest
             platform: linux

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   MATURIN_VERSION: 1.7.4
-  PY_ALL: 3.8 3.9 3.10 3.11 3.12 3.13 pypy3.8 pypy3.9 pypy3.10
+  PY_ALL: 3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10
 
 jobs:
   sdist:
@@ -46,13 +46,13 @@ jobs:
             platform: linux
             target: x86_64
             manylinux: auto
-            interpreter: pypy3.8 pypy3.9 pypy3.10
+            interpreter: pypy3.9 pypy3.10
           - os: macos
             target: x86_64
-            interpreter: pypy3.8 pypy3.9 pypy3.10
+            interpreter: pypy3.9 pypy3.10
           - os: macos
             target: aarch64
-            interpreter: pypy3.8 pypy3.9 pypy3.10
+            interpreter: pypy3.9 pypy3.10
           - os: ubuntu
             platform: linux
             target: aarch64
@@ -67,7 +67,7 @@ jobs:
             manylinux: musllinux_1_1
           - os: windows
             target: x86_64
-            interpreter: pypy3.8 pypy3.9 pypy3.10
+            interpreter: pypy3.9 pypy3.10
         exclude:
           - os: windows
             target: aarch64
@@ -102,7 +102,7 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-13, macos-14, windows-latest]
         manylinux: [auto]
-        interpreter: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
+        interpreter: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         include:
           - os: ubuntu-latest
             platform: linux

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-        - '3.8'
         - '3.9'
         - '3.10'
         - '3.11'
@@ -50,7 +49,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-        - '3.8'
         - '3.9'
         - '3.10'
         - '3.11'
@@ -81,7 +79,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-        - '3.8'
         - '3.9'
         - '3.10'
         - '3.11'

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -43,8 +43,8 @@ pem = "=3.0"
 percent-encoding = "=2.3"
 pin-project = "1.1"
 pkcs8 = { version = "=0.10", features = ["encryption", "pkcs5"] }
-pyo3 = { version = "=0.22", features = ["anyhow", "extension-module", "generate-import-lib"] }
-pyo3-log = "=0.11"
+pyo3 = { version = "=0.23", features = ["anyhow", "extension-module", "generate-import-lib"] }
+pyo3-log = "=0.12"
 rustls-pemfile = "2.2"
 socket2 = { version = "0.5", features = ["all"] }
 tls-listener = { version = "=0.10", features = ["rustls"] }

diff --git a/README.md b/README.md
@@ -277,7 +277,7 @@ You might test the effect such optimizations cause over your application and dec
 
 Granian is currently under active development.
 
-Granian is compatible with Python 3.8 and above versions.
+Granian is compatible with Python 3.9 and above versions.
 
 ## License
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,6 @@ classifiers = [
     'Operating System :: Microsoft :: Windows',
     'Operating System :: POSIX :: Linux',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
@@ -32,7 +31,7 @@ dynamic = [
     'version',
 ]
 
-requires-python = '>=3.8'
+requires-python = '>=3.9'
 dependencies = [
     'click>=8.0.0',
     'uvloop>=0.18.0; sys_platform != "win32" and platform_python_implementation == "CPython"',

diff --git a/src/asgi/callbacks.rs b/src/asgi/callbacks.rs
@@ -43,14 +43,14 @@ pub(crate) struct CallbackWatcherHTTP {
     #[pyo3(get)]
     proto: Py<HTTPProtocol>,
     #[pyo3(get)]
-    scope: PyObject,
+    scope: Py<PyDict>,
 }
 
 impl CallbackWatcherHTTP {
     pub fn new(py: Python, proto: HTTPProtocol, scope: Bound<PyDict>) -> Self {
         Self {
             proto: Py::new(py, proto).unwrap(),
-            scope: scope.into_py(py),
+            scope: scope.unbind(),
         }
     }
 }
@@ -62,7 +62,7 @@ impl CallbackWatcherHTTP {
     }
 
     fn err(&self, err: Bound<PyAny>) {
-        callback_impl_done_err!(self, &PyErr::from_value_bound(err));
+        callback_impl_done_err!(self, &PyErr::from_value(err));
     }
 }
 
@@ -71,14 +71,14 @@ pub(crate) struct CallbackWatcherWebsocket {
     #[pyo3(get)]
     proto: Py<WebsocketProtocol>,
     #[pyo3(get)]
-    scope: PyObject,
+    scope: Py<PyDict>,
 }
 
 impl CallbackWatcherWebsocket {
     pub fn new(py: Python, proto: WebsocketProtocol, scope: Bound<PyDict>) -> Self {
         Self {
             proto: Py::new(py, proto).unwrap(),
-            scope: scope.into_py(py),
+            scope: scope.unbind(),
         }
     }
 }
@@ -90,7 +90,7 @@ impl CallbackWatcherWebsocket {
     }
 
     fn err(&self, err: Bound<PyAny>) {
-        callback_impl_done_err!(self, &PyErr::from_value_bound(err));
+        callback_impl_done_err!(self, &PyErr::from_value(err));
     }
 }