Merge pull request #17 from jawah/release-5.0.8

Release 5.0.8

Author: Ousret

.github/workflows/CI.yml

@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04, macos-13, windows-latest ]
-        python_version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10']
+        python_version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', 'pypy-3.11']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-22.04, macos-13, windows-latest ]
-        python_version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10' ]
+        python_version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', 'pypy-3.11' ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -125,7 +125,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [x86_64, aarch64, armv7, s390x, ppc64le, ppc64, i686]
-        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', '3.13t']
+        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', 'pypy-3.11', '3.13t']
         manylinux: ['auto', 'musllinux_1_1']
         exclude:
           - manylinux: musllinux_1_1
@@ -171,7 +171,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [x64, aarch64, x86]
-        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', '3.13t']
+        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', 'pypy-3.11', '3.13t']
         exclude:
           - target: aarch64
             python_version: 'pypy-3.7'
@@ -181,6 +181,8 @@ jobs:
             python_version: 'pypy-3.9'
           - target: aarch64
             python_version: 'pypy-3.10'
+          - target: aarch64
+            python_version: 'pypy-3.11'
           - target: x86
             python_version: 'pypy-3.7'
           - target: x86
@@ -189,6 +191,8 @@ jobs:
             python_version: 'pypy-3.9'
           - target: x86
             python_version: 'pypy-3.10'
+          - target: x86
+            python_version: 'pypy-3.11'
           - target: x86
             python_version: '3.13t'
     steps:
@@ -237,7 +241,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [universal2]
-        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', '3.13t']
+        python_version: ['3.10', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9', 'pypy-3.10', 'pypy-3.11', '3.13t']
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Release History
 ===============
 
+5.0.8 (2025-03-06)
+------------------
+
+- Add PyPy 3.11 pre-built optimized build in CI/CD
+- Backported "Use bytearray() in FrameBuffer" from upstreams for improved performance
+- (rust) Upgrade pyo3 from 0.23.4 to 0.23.5
+
 5.0.7 (2025-01-21)
 ------------------
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "jh2"
-version = "5.0.7"
+version = "5.0.8"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Cargo.toml

@@ -7,4 +7,4 @@
 
 from __future__ import annotations
 
-__version__ = "5.0.7"
+__version__ = "5.0.8"

jh2/__init__.py

@@ -30,7 +30,7 @@ class FrameBuffer:
     """
 
     def __init__(self, server=False):
-        self.data = b""
+        self._data = bytearray()
         self.max_frame_size = 0
         self._preamble = b"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" if server else b""
         self._preamble_len = len(self._preamble)
@@ -53,7 +53,7 @@ def add_data(self, data):
             self._preamble_len -= of_which_preamble
             self._preamble = self._preamble[of_which_preamble:]
 
-        self.data += data
+        self._data += data
 
     def _validate_frame_length(self, length):
         """
@@ -119,33 +119,33 @@ def __iter__(self):
     def __next__(self):
         # First, check that we have enough data to successfully parse the
         # next frame header. If not, bail. Otherwise, parse it.
-        if len(self.data) < 9:
+        if len(self._data) < 9:
             raise StopIteration()
 
         try:
-            f, length = Frame.parse_frame_header(self.data[:9])
+            f, length = Frame.parse_frame_header(memoryview(self._data[:9]))
         except (InvalidDataError, InvalidFrameError) as e:  # pragma: no cover
             raise ProtocolError("Received frame with invalid header: %s" % str(e))
 
         # Next, check that we have enough length to parse the frame body. If
         # not, bail, leaving the frame header data in the buffer for next time.
-        if len(self.data) < length + 9:
+        if len(self._data) < length + 9:
             raise StopIteration()
 
         # Confirm the frame has an appropriate length.
         self._validate_frame_length(length)
 
         # Try to parse the frame body
         try:
-            f.parse_body(memoryview(self.data[9 : 9 + length]))
+            f.parse_body(memoryview(self._data[9 : 9 + length]))
         except InvalidDataError:
             raise ProtocolError("Received frame with non-compliant data")
         except InvalidFrameError:
             raise FrameDataMissingError("Frame data missing or invalid")
 
         # At this point, as we know we'll use or discard the entire frame, we
         # can update the data.
-        self.data = self.data[9 + length :]
+        self._data = self._data[9 + length :]
 
         # Pass the frame through the header buffer.
         f = self._update_header_buffer(f)

jh2/frame_buffer.py

@@ -6,7 +6,6 @@ build-backend = "hatchling.build"
 name = "jh2"
 description = "HTTP/2 State-Machine based protocol implementation"
 readme = "README.rst"
-license-files = { paths = ["LICENSE"] }
 license = "MIT"
 keywords = ["http2", "hpack", "h2"]
 authors = [

pyproject.fb.toml

@@ -6,8 +6,8 @@ build-backend = "maturin"
 name = "jh2"
 description = "HTTP/2 State-Machine based protocol implementation"
 readme = "README.rst"
-license-files = { paths = ["LICENSE"] }
 license = "MIT"
+license-files = ["LICENSE"]
 keywords = ["http2", "hpack", "h2"]
 authors = [
   {name = "Cory Benfield", email = "[email protected]"}