Skip to content

Commit 3912586

Browse files
authored
Merge pull request #7 from jawah/release-5.0.6
Release 5.0.6
2 parents 3bf1108 + cc66daf commit 3912586

10 files changed

+64
-53
lines changed

.github/dependabot.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
ignore:
8+
- dependency-name: "*"
9+
update-types: ["version-update:semver-patch"]
10+
- package-ecosystem: "pip"
11+
directory: "/"
12+
schedule:
13+
interval: "monthly"
14+
ignore:
15+
- dependency-name: "*"
16+
update-types: [ "version-update:semver-patch" ]
17+
- package-ecosystem: cargo
18+
directory: "/"
19+
schedule:
20+
interval: "monthly"
21+
groups:
22+
all:
23+
patterns:
24+
- "*"

.github/workflows/CI.yml

+8-11
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,6 @@ jobs:
181181
python_version: 'pypy-3.9'
182182
- target: aarch64
183183
python_version: 'pypy-3.10'
184-
- target: aarch64
185-
python_version: '3.13t'
186184
steps:
187185
- uses: actions/checkout@v4
188186
- uses: actions/setup-python@v5
@@ -191,28 +189,27 @@ jobs:
191189
python-version: ${{ matrix.python_version }}
192190
architecture: x64
193191
- uses: Quansight-Labs/setup-python@v5
194-
if: matrix.python_version == '3.13t'
192+
if: matrix.python_version == '3.13t' && matrix.target == 'x64'
195193
with:
196-
python-version: 3.13t
194+
python-version: '3.13t'
197195
architecture: x64
198-
- name: Build wheels wo/ PYO3_CROSS
196+
- name: Build wheels (normal)
199197
uses: PyO3/maturin-action@v1
200-
if: matrix.target != 'aarch64'
198+
if: matrix.python_version != '3.13t' || matrix.target == 'x64'
201199
env:
202200
UNSAFE_PYO3_SKIP_VERSION_CHECK: 1
203201
with:
204202
target: ${{ matrix.target }}
205203
args: --release --out dist
206204
sccache: 'true'
207-
- name: Build wheels w/ PYO3_CROSS
205+
- name: Build wheels (workaround 3.13t arm64)
208206
uses: PyO3/maturin-action@v1
209-
if: matrix.target == 'aarch64'
207+
if: matrix.python_version == '3.13t' && matrix.target == 'aarch64'
210208
env:
211-
UNSAFE_PYO3_SKIP_VERSION_CHECK: 1
212209
PYO3_CROSS: 1
213210
with:
214211
target: ${{ matrix.target }}
215-
args: --release --out dist
212+
args: --release --out dist -i 3.13t
216213
sccache: 'true'
217214
- name: Upload wheels
218215
uses: actions/upload-artifact@v3
@@ -347,7 +344,7 @@ jobs:
347344
with:
348345
name: wheels
349346
- name: Publish to PyPI
350-
uses: PyO3/maturin-action@v1.42.1
347+
uses: PyO3/maturin-action@v1
351348
with:
352349
command: upload
353350
args: --non-interactive --skip-existing *

.pre-commit-config.yaml

+1-10
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,9 @@ repos:
77
- id: debug-statements
88
- id: end-of-file-fixer
99
- id: trailing-whitespace
10-
- repo: https://github.com/asottile/pyupgrade
11-
rev: v3.19.1
12-
hooks:
13-
- id: pyupgrade
14-
args: [--py37-plus]
15-
- repo: https://github.com/PyCQA/isort
16-
rev: 5.12.0
17-
hooks:
18-
- id: isort
1910
- repo: https://github.com/astral-sh/ruff-pre-commit
2011
# Ruff version.
21-
rev: v0.8.4
12+
rev: v0.9.1
2213
hooks:
2314
# Run the linter.
2415
- id: ruff

CHANGELOG.rst

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Release History
22
===============
33

4+
5.0.6 (2025-01-13)
5+
------------------
6+
7+
- (Rust) Updated pyo3 from 0.23.3 to 0.23.4
8+
49
5.0.5 (2025-01-01)
510
------------------
611

Cargo.lock

+17-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "jh2"
3-
version = "5.0.5"
3+
version = "5.0.6"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -9,7 +9,7 @@ name = "jh2"
99
crate-type = ["cdylib"]
1010

1111
[dependencies]
12-
pyo3 = { version = "0.23.3", features = ["abi3-py37", "extension-module", "generate-import-lib"] }
12+
pyo3 = { version = "0.23.4", features = ["abi3-py37", "extension-module", "generate-import-lib"] }
1313
httlib-hpack = { version = "0.1.3" }
1414

1515
[package.metadata.maturin]

jh2/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
from __future__ import annotations
99

10-
__version__ = "5.0.5"
10+
__version__ = "5.0.6"

jh2/events.py

+4-9
Original file line numberDiff line numberDiff line change
@@ -285,15 +285,10 @@ def __init__(self):
285285
self.stream_ended = None
286286

287287
def __repr__(self):
288-
return (
289-
"<DataReceived stream_id:%s, "
290-
"flow_controlled_length:%s, "
291-
"data:%s>"
292-
% (
293-
self.stream_id,
294-
self.flow_controlled_length,
295-
_bytes_representation(self.data[:20]),
296-
)
288+
return "<DataReceived stream_id:%s, flow_controlled_length:%s, data:%s>" % (
289+
self.stream_id,
290+
self.flow_controlled_length,
291+
_bytes_representation(self.data[:20]),
297292
)
298293

299294

jh2/settings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def __init__(self, setting, original_value, new_value):
8383
self.new_value = new_value
8484

8585
def __repr__(self):
86-
return ("ChangedSetting(setting=%s, original_value=%s, " "new_value=%s)") % (
86+
return ("ChangedSetting(setting=%s, original_value=%s, new_value=%s)") % (
8787
self.setting,
8888
self.original_value,
8989
self.new_value,

jh2/stream.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1184,8 +1184,7 @@ def receive_data(self, data, end_stream, flow_control_len):
11841184
Receive some data.
11851185
"""
11861186
self.config.logger.debug(
1187-
"Receive data on %r with end stream %s and flow control length "
1188-
"set to %d",
1187+
"Receive data on %r with end stream %s and flow control length set to %d",
11891188
self,
11901189
end_stream,
11911190
flow_control_len,

0 commit comments

Comments
 (0)