Skip to content

Commit

Permalink
cargo update
Browse files Browse the repository at this point in the history
  • Loading branch information
ijl committed Aug 3, 2023
1 parent ee8759c commit f94318a
Show file tree
Hide file tree
Showing 10 changed files with 96 additions and 96 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ jobs:
options: --user 0
steps:
- run: yum install -y clang lld
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-06-30 --profile minimal -y
- run: rustup component add rust-src --toolchain nightly-2023-06-30-x86_64-unknown-linux-gnu
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-07-30 --profile minimal -y
- run: rustup component add rust-src --toolchain nightly-2023-07-30-x86_64-unknown-linux-gnu
- uses: actions/checkout@v3

- name: build-std
Expand All @@ -82,7 +82,7 @@ jobs:
- run: |
maturin build --release --strip \
--out=dist \
--features=unstable-simd,yyjson \
--features=no-panic,yyjson \
--compatibility manylinux_2_17 \
--interpreter python${{ matrix.python.version }} \
--target=x86_64-unknown-linux-gnu
Expand Down Expand Up @@ -139,11 +139,11 @@ jobs:
RUSTFLAGS: "-C target-feature=-crt-static"
CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
with:
rust-toolchain: nightly-2023-06-30
rust-toolchain: nightly-2023-07-30
rustup-components: rust-src
target: ${{ matrix.platform.target }}
manylinux: musllinux_1_1
args: --release --strip --out=dist --features=unstable-simd,yyjson -i python${{ matrix.python.version }}
args: --release --strip --out=dist --features=no-panic,yyjson -i python${{ matrix.python.version }}

- name: Set up QEMU
if: matrix.platform.arch != 'x86_64'
Expand Down Expand Up @@ -225,13 +225,12 @@ jobs:
CFLAGS: "${{ matrix.target.cflags }}"
LDFLAGS: "${{ matrix.target.cflags }} -flto -Wl,--as-needed"
CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
CARGO_FEATURE_YYJSON: "1"
with:
target: ${{ matrix.target.target }}
rust-toolchain: nightly-2023-06-30
rust-toolchain: nightly-2023-07-30
rustup-components: rust-src
manylinux: auto
args: --release --strip --out=dist -i python${{ matrix.python.version }}
args: --release --strip --out=dist --features=no-panic,yyjson -i python${{ matrix.python.version }}

- uses: uraimo/run-on-arch-action@v2
name: Test
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/next.yaml

This file was deleted.

95 changes: 75 additions & 20 deletions Cargo.lock

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

11 changes: 8 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ unstable-simd = [
"encoding_rs/simd-accel",
]

no-panic = [
"itoa/no-panic",
"ryu/no-panic",
]

# Build yyjson as a backend and panic if it fails. The default is to attempt
# to build and on failure fall back to another backend.
yyjson = []
Expand All @@ -54,16 +59,16 @@ encoding_rs = { version = "0.8", default_features = false }
itoa = { version = "1", default_features = false }
itoap = { version = "1", features = ["std", "simd"] }
once_cell = { version = "1", default_features = false, features = ["race"] }
pyo3-ffi = { version = "^0.19.1", default_features = false, features = ["extension-module"]}
pyo3-ffi = { version = "^0.19.2", default_features = false, features = ["extension-module"]}
ryu = { version = "1", default_features = false }
serde = { version = "1", default_features = false }
serde_json = { version = "1", default_features = false, features = ["std", "float_roundtrip"] }
simdutf8 = { version = "0.1", default_features = false, features = ["std", "aarch64_neon"] }
smallvec = { version = "^1.10", default_features = false, features = ["union", "write"] }
smallvec = { version = "^1.11", default_features = false, features = ["union", "write"] }

[build-dependencies]
cc = { version = "1" }
pyo3-build-config = { version = "^0.19.1" }
pyo3-build-config = { version = "^0.19.2" }
version_check = { version = "0.9" }

[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ It benefits from also having a C build environment to compile a faster
deserialization backend. See this project's `manylinux_2_28` builds for an
example using clang and LTO.

The project's own CI tests against `nightly-2023-06-30` and stable 1.60. It
The project's own CI tests against `nightly-2023-07-30` and stable 1.60. It
is prudent to pin the nightly version because that channel can introduce
breaking changes.

Expand Down
2 changes: 1 addition & 1 deletion ci/azure-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ steps:
PATH=$HOME/.cargo/bin:$PATH \
MACOSX_DEPLOYMENT_TARGET=$(macosx_deployment_target) \
PYO3_CROSS_LIB_DIR=$(python -c "import sysconfig;print(sysconfig.get_config_var('LIBDIR'))") \
maturin build --release --strip --features=unstable-simd,yyjson --interpreter $(interpreter) --target=universal2-apple-darwin
maturin build --release --strip --features=no-panic,yyjson --interpreter $(interpreter) --target=universal2-apple-darwin
env:
CC: "clang"
LDFLAGS: "-O2 -flto=thin -fuse-ld=lld -Wl,--as-needed"
Expand Down
2 changes: 1 addition & 1 deletion ci/azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
toolchain: nightly-2023-06-30
toolchain: nightly-2023-07-30

jobs:

Expand Down
6 changes: 1 addition & 5 deletions ci/azure-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,12 @@ steps:
displayName: build dependencies
- script: python.exe -m pip install -r test\requirements.txt -r integration\requirements.txt
displayName: test dependencies
- script: maturin.exe build --release --strip --interpreter $(interpreter)
- script: maturin.exe build --release --features=no-panic,yyjson --strip --interpreter $(interpreter)
displayName: build
- script: python.exe -m pip install orjson --no-index --find-links=D:\a\1\s\target\wheels
displayName: install
- script: python.exe -m pytest -s -rxX -v test
displayName: pytest
- script: python.exe -m pip uninstall -y numpy
displayName: remove optional packages
- script: python.exe -m pytest -s -rxX -v test
displayName: pytest without optional packages
- script: python.exe integration\thread
displayName: thread
- script: python.exe integration\init
Expand Down
2 changes: 1 addition & 1 deletion src/deserialize/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl<'a> DeserializeError<'a> {
/// Return position of the error in the deserialized data
#[cold]
#[cfg(not(feature = "yyjson"))]
#[cfg_attr(feature = "unstable-simd", optimize(size))]
#[cfg_attr(feature = "optimize", optimize(size))]
pub fn pos(&self) -> i64 {
if self.line == 0 || self.data.is_none() {
return 1;
Expand Down
2 changes: 1 addition & 1 deletion test/test_memory.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Object:
for i in range(100000, 101000)
]

MAX_INCREASE = 1048576 # 1MiB
MAX_INCREASE = 2097152 # 2MiB


class Unsupported:
Expand Down

0 comments on commit f94318a

Please sign in to comment.