Skip to content

Commit d581687

Browse files
ijlijl
committed
build, clippy misc
1 parent 4105b29 commit d581687

23 files changed

Lines changed: 146 additions & 164 deletions

‎.github/workflows/artifact.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
FORCE_COLOR: "1"
88
ORJSON_BUILD_FREETHREADED: "1"
99
PIP_DISABLE_PIP_VERSION_CHECK: "1"
10-
RUST_TOOLCHAIN: "nightly-2025-12-01"
10+
RUST_TOOLCHAIN: "nightly-2026-01-28"
1111
RUST_TOOLCHAIN_STABLE: "1.89"
1212
UNSAFE_PYO3_BUILD_FREE_THREADED: "1"
1313
UNSAFE_PYO3_SKIP_VERSION_CHECK: "1"
@@ -212,7 +212,7 @@ jobs:
212212
compression-level: 0
213213

214214
- name: setup-qemu-container
215-
if: "matrix.target.arch == 's390x'"
215+
if: "matrix.target.arch == 's390x' || matrix.target.arch == 'ppc64le'"
216216
uses: sandervocke/setup-qemu-container@v1
217217
with:
218218
container: registry.fedoraproject.org/fedora:43
@@ -223,7 +223,7 @@ jobs:
223223
uses: sandervocke/setup-shell-wrapper@v1
224224

225225
- name: Emulated Test
226-
if: "matrix.target.arch == 's390x'"
226+
if: "matrix.target.arch == 's390x' || matrix.target.arch == 'ppc64le'"
227227
shell: wrap-shell {0}
228228
env:
229229
WRAP_SHELL: run-in-container.sh
@@ -287,7 +287,7 @@ jobs:
287287
- name: Test
288288
uses: addnab/docker-run-action@v3
289289
with:
290-
image: "quay.io/pypa/musllinux_1_2_${{ matrix.platform.arch }}:2025.07.25-1"
290+
image: "quay.io/pypa/musllinux_1_2_${{ matrix.platform.arch }}:2026.01.28-1"
291291
options: -v ${{ github.workspace }}:/io -w /io
292292
run: |
293293
apk add tzdata
@@ -362,7 +362,7 @@ jobs:
362362
- name: Test
363363
uses: addnab/docker-run-action@v3
364364
with:
365-
image: "quay.io/pypa/musllinux_1_2_${{ matrix.platform.arch }}:2025.07.25-1"
365+
image: "quay.io/pypa/musllinux_1_2_${{ matrix.platform.arch }}:2026.01.28-1"
366366
options: -v ${{ github.workspace }}:/io -w /io
367367
run: |
368368
apk add tzdata

‎.github/workflows/stale.yaml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Cargo.lock‎

Lines changed: 39 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@ Releases follow semantic versioning and serializing a new object type
4141
without an opt-in flag is considered a breaking change.
4242

4343
orjson contains source code licensed under the Mozilla Public License 2.0,
44-
Apache 2.0, and MIT licenses. The repository and issue tracker is
45-
[github.com/ijl/orjson](https://github.com/ijl/orjson), and patches may be
46-
submitted there. There is a
47-
[CHANGELOG](https://github.com/ijl/orjson/blob/master/CHANGELOG.md)
44+
Apache 2.0, and MIT licenses. The repository from which PyPI artifacts are
45+
published is [github.com/ijl/orjson](https://github.com/ijl/orjson) and an
46+
alternative repository is [codeberg.org/ijl/orjson](https://codeberg.org/ijl/orjson).
47+
There is no open issue tracker or pull requests due to signal-to-noise ratio.
48+
There is a [CHANGELOG](https://github.com/ijl/orjson/blob/master/CHANGELOG.md)
4849
available in the repository.
4950

5051
1. [Usage](https://github.com/ijl/orjson?tab=readme-ov-file#usage)
@@ -1076,14 +1077,14 @@ The recommended build command is:
10761077
maturin build --release --strip
10771078
```
10781079

1079-
The project's own CI tests against `nightly-2025-12-01` and stable 1.89. It
1080+
The project's own CI tests against `nightly-2026-01-28` and stable 1.89. It
10801081
is prudent to pin the nightly version because that channel can introduce
10811082
breaking changes. There is a significant performance benefit to using
10821083
nightly.
10831084

1084-
orjson is tested on native hardware for amd64, aarch64, and i686 on Linux and
1085-
for arm7, ppc64le, and s390x is cross-compiled and may be tested via
1086-
emulation. It is tested for aarch64 on macOS and cross-compiles for amd64. For
1085+
orjson is tested on native hardware for amd64, aarch64, and i686 on Linux. It is
1086+
cross-compiled and may be tested via emulation for arm7, ppc64le, and s390x. It
1087+
is tested for aarch64 on macOS and cross-compiles for amd64. For
10871088
Windows it is tested on amd64, i686, and aarch64.
10881089

10891090
There are no runtime dependencies other than libc.

‎bench/benchmark_dumps.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
2-
# Copyright Aarni Koskela (2021), ijl (2020-2025)
2+
# Copyright ijl (2020-2026), Aarni Koskela (2021)
33

44
from json import loads as json_loads
55

66
import pytest
77

8-
from .data import fixtures, libraries
9-
from .util import read_fixture_obj
8+
from .data import FIXTURE_AS_OBJECTS, FIXTURE_NAMES, LIBRARIES
109

1110

12-
@pytest.mark.parametrize("library", libraries)
13-
@pytest.mark.parametrize("fixture", fixtures)
11+
@pytest.mark.parametrize("library", LIBRARIES)
12+
@pytest.mark.parametrize("fixture", FIXTURE_NAMES)
1413
def test_dumps(benchmark, fixture, library):
15-
dumper, _ = libraries[library]
14+
dumper, _ = LIBRARIES[library]
1615
benchmark.group = f"{fixture} serialization"
1716
benchmark.extra_info["lib"] = library
18-
data = read_fixture_obj(f"{fixture}.xz")
17+
data = FIXTURE_AS_OBJECTS[fixture]
1918
benchmark.extra_info["correct"] = json_loads(dumper(data)) == data # type: ignore
2019
benchmark(dumper, data)

‎bench/benchmark_loads.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
2-
# Copyright Aarni Koskela (2021), ijl (2020-2024)
2+
# Copyright ijl (2020-2026), Aarni Koskela (2021)
33

44
from json import loads as json_loads
55

66
import pytest
77

8-
from .data import fixtures, libraries
9-
from .util import read_fixture
8+
from .data import FIXTURE_AS_BYTES, FIXTURE_NAMES, LIBRARIES
109

1110

12-
@pytest.mark.parametrize("fixture", fixtures)
13-
@pytest.mark.parametrize("library", libraries)
11+
@pytest.mark.parametrize("fixture", FIXTURE_NAMES)
12+
@pytest.mark.parametrize("library", LIBRARIES)
1413
def test_loads(benchmark, fixture, library):
15-
dumper, loader = libraries[library]
14+
dumper, loader = LIBRARIES[library]
1615
benchmark.group = f"{fixture} deserialization"
1716
benchmark.extra_info["lib"] = library
18-
data = read_fixture(f"{fixture}.xz")
17+
data = FIXTURE_AS_BYTES[fixture]
1918
correct = json_loads(dumper(loader(data))) == json_loads(data) # type: ignore
2019
benchmark.extra_info["correct"] = correct
2120
benchmark(loader, data)

0 commit comments

Comments
 (0)