Skip to content

Commit

Permalink
cargo update
Browse files Browse the repository at this point in the history
  • Loading branch information
ijl committed Jul 7, 2023
1 parent 314dc9d commit 26c93c6
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 40 deletions.
10 changes: 5 additions & 5 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-05-31 --profile minimal -y
- run: rustup component add rust-src --toolchain nightly-2023-05-31-x86_64-unknown-linux-gnu
- 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
- uses: actions/checkout@v3

- name: build-std
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
RUSTFLAGS: "-C target-feature=-crt-static"
CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
with:
rust-toolchain: nightly-2023-05-31
rust-toolchain: nightly-2023-06-30
rustup-components: rust-src
target: ${{ matrix.platform.target }}
manylinux: musllinux_1_1
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
{
arch: 'armv7',
target: 'armv7-unknown-linux-gnueabihf',
cflags: '-Os',
cflags: '-Os -fstrict-aliasing',
},
{
arch: 'ppc64le',
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
CARGO_FEATURE_YYJSON: "1"
with:
target: ${{ matrix.target.target }}
rust-toolchain: nightly-2023-05-31
rust-toolchain: nightly-2023-06-30
rustup-components: rust-src
manylinux: auto
args: --release --strip --out=dist -i python${{ matrix.python.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/next.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
image: registry.hub.docker.com/library/python:3.12-rc-bullseye
options: --user 0
steps:
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-05-31 --profile minimal -y
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-06-30 --profile minimal -y
- run: python3 -m pip install --user --upgrade pip "maturin>=1,<2" wheel
- uses: actions/checkout@v3

Expand Down
52 changes: 26 additions & 26 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
Expand Up @@ -54,7 +54,7 @@ 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", default_features = false, features = ["extension-module"]}
pyo3-ffi = { version = "^0.19.1", 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"] }
Expand All @@ -63,7 +63,7 @@ smallvec = { version = "^1.10", default_features = false, features = ["union", "

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

[profile.release]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ b'"1970-01-01T00:00:00Z"'
#### Fragment

`orjson.Fragment` includes already-serialized JSON in a document. This is an
efficient way include JSON blobs from a cache, JSONB field, or separately
efficient way to include JSON blobs from a cache, JSONB field, or separately
serialized object without first deserializing to Python objects via `loads()`.

```python
Expand Down 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-05-31` and stable 1.60. It
The project's own CI tests against `nightly-2023-06-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-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
toolchain: nightly-2023-05-31
toolchain: nightly-2023-06-30

jobs:

Expand Down
2 changes: 1 addition & 1 deletion script/develop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ rm -f target/wheels/*

export CC="clang"
export CFLAGS="-O2 -fno-plt -flto=thin"
export LDFLAGS="-O2 -flto=thin -fuse-ld=lld -Wl,--as-needed"
export LDFLAGS="${CFLAGS} -fuse-ld=lld -Wl,--as-needed"
export RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=lld"

maturin build -i python3 --release "$@"
Expand Down
2 changes: 2 additions & 0 deletions src/ffi/fragment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ pub unsafe extern "C" fn orjson_fragmenttype_new() -> *mut PyTypeObject {
tp_descr_set: None,
tp_dictoffset: 0,
tp_alloc: None,
#[cfg(Py_3_12)]
tp_watched: 0,
});
let ob_ptr = Box::into_raw(ob);
PyType_Ready(ob_ptr);
Expand Down
4 changes: 2 additions & 2 deletions test/test_numpy.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def test_numpy_array_non_contiguous_message(self):
)

def test_numpy_array_unsupported_dtype(self):
array = numpy.array([[1, 2], [3, 4]], numpy.float16)
array = numpy.array([[1, 2], [3, 4]], numpy.float16) # type: ignore
with pytest.raises(orjson.JSONEncodeError) as cm:
orjson.dumps(array, option=orjson.OPT_SERIALIZE_NUMPY)
assert "unsupported datatype in numpy array" in str(cm)
Expand Down Expand Up @@ -708,7 +708,7 @@ def test_numpy_datetime_nat(self):
orjson.dumps([numpy.datetime64("NaT")], option=orjson.OPT_SERIALIZE_NUMPY)

def test_numpy_repeated(self):
data = numpy.array([[[1, 2], [3, 4], [5, 6], [7, 8]]], numpy.int64)
data = numpy.array([[[1, 2], [3, 4], [5, 6], [7, 8]]], numpy.int64) # type: ignore
for _ in range(0, 3):
assert (
orjson.dumps(
Expand Down

0 comments on commit 26c93c6

Please sign in to comment.