Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 5.0.6 #7

Merged
merged 8 commits into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-patch"]
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "monthly"
ignore:
- dependency-name: "*"
update-types: [ "version-update:semver-patch" ]
- package-ecosystem: cargo
directory: "/"
schedule:
interval: "monthly"
groups:
all:
patterns:
- "*"
19 changes: 8 additions & 11 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@ jobs:
python_version: 'pypy-3.9'
- target: aarch64
python_version: 'pypy-3.10'
- target: aarch64
python_version: '3.13t'
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
Expand All @@ -191,28 +189,27 @@ jobs:
python-version: ${{ matrix.python_version }}
architecture: x64
- uses: Quansight-Labs/setup-python@v5
if: matrix.python_version == '3.13t'
if: matrix.python_version == '3.13t' && matrix.target == 'x64'
with:
python-version: 3.13t
python-version: '3.13t'
architecture: x64
- name: Build wheels wo/ PYO3_CROSS
- name: Build wheels (normal)
uses: PyO3/maturin-action@v1
if: matrix.target != 'aarch64'
if: matrix.python_version != '3.13t' || matrix.target == 'x64'
env:
UNSAFE_PYO3_SKIP_VERSION_CHECK: 1
with:
target: ${{ matrix.target }}
args: --release --out dist
sccache: 'true'
- name: Build wheels w/ PYO3_CROSS
- name: Build wheels (workaround 3.13t arm64)
uses: PyO3/maturin-action@v1
if: matrix.target == 'aarch64'
if: matrix.python_version == '3.13t' && matrix.target == 'aarch64'
env:
UNSAFE_PYO3_SKIP_VERSION_CHECK: 1
PYO3_CROSS: 1
with:
target: ${{ matrix.target }}
args: --release --out dist
args: --release --out dist -i 3.13t
sccache: 'true'
- name: Upload wheels
uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -347,7 +344,7 @@ jobs:
with:
name: wheels
- name: Publish to PyPI
uses: PyO3/maturin-action@v1.42.1
uses: PyO3/maturin-action@v1
with:
command: upload
args: --non-interactive --skip-existing *
11 changes: 1 addition & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,9 @@ repos:
- id: debug-statements
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/asottile/pyupgrade
rev: v3.19.1
hooks:
- id: pyupgrade
args: [--py37-plus]
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.8.4
rev: v0.9.1
hooks:
# Run the linter.
- id: ruff
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Release History
===============

5.0.6 (2025-01-13)
------------------

- (Rust) Updated pyo3 from 0.23.3 to 0.23.4

5.0.5 (2025-01-01)
------------------

Expand Down
34 changes: 17 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "jh2"
version = "5.0.5"
version = "5.0.6"
edition = "2021"

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

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

[package.metadata.maturin]
Expand Down
2 changes: 1 addition & 1 deletion jh2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

from __future__ import annotations

__version__ = "5.0.5"
__version__ = "5.0.6"
13 changes: 4 additions & 9 deletions jh2/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,10 @@ def __init__(self):
self.stream_ended = None

def __repr__(self):
return (
"<DataReceived stream_id:%s, "
"flow_controlled_length:%s, "
"data:%s>"
% (
self.stream_id,
self.flow_controlled_length,
_bytes_representation(self.data[:20]),
)
return "<DataReceived stream_id:%s, flow_controlled_length:%s, data:%s>" % (
self.stream_id,
self.flow_controlled_length,
_bytes_representation(self.data[:20]),
)


Expand Down
2 changes: 1 addition & 1 deletion jh2/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def __init__(self, setting, original_value, new_value):
self.new_value = new_value

def __repr__(self):
return ("ChangedSetting(setting=%s, original_value=%s, " "new_value=%s)") % (
return ("ChangedSetting(setting=%s, original_value=%s, new_value=%s)") % (
self.setting,
self.original_value,
self.new_value,
Expand Down
3 changes: 1 addition & 2 deletions jh2/stream.py
Original file line number Diff line number Diff line change
Expand Up @@ -1184,8 +1184,7 @@ def receive_data(self, data, end_stream, flow_control_len):
Receive some data.
"""
self.config.logger.debug(
"Receive data on %r with end stream %s and flow control length "
"set to %d",
"Receive data on %r with end stream %s and flow control length set to %d",
self,
end_stream,
flow_control_len,
Expand Down
Loading