diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..35861e1c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +include/** linguist-vendored diff --git a/.github/workflows/linux-cross.yaml b/.github/workflows/linux-cross.yaml index 56f32a12..2bcf2525 100644 --- a/.github/workflows/linux-cross.yaml +++ b/.github/workflows/linux-cross.yaml @@ -52,3 +52,22 @@ jobs: with: name: wheels path: dist + + release: + name: Release + runs-on: ubuntu-22.04 + if: "startsWith(github.ref, 'refs/tags/')" + needs: [ linux-cross ] + steps: + - uses: actions/download-artifact@v2 + with: + name: wheels + - uses: actions/setup-python@v2 + with: + python-version: "3.10" + - run: pip install "maturin>=0.12.18,<0.13" + - name: deploy + run: maturin upload --skip-existing --username "$MATURIN_USERNAME" *.whl + env: + MATURIN_USERNAME: ${{ secrets.TWINE_USERNAME }} + MATURIN_PASSWORD: ${{ secrets.TWINE_PASSWORD }} diff --git a/.github/workflows/manylinux-2-28.yaml b/.github/workflows/manylinux-2-28.yaml index 45b03bf8..8df2d248 100644 --- a/.github/workflows/manylinux-2-28.yaml +++ b/.github/workflows/manylinux-2-28.yaml @@ -22,7 +22,7 @@ jobs: image: quay.io/pypa/manylinux_2_28_x86_64:latest options: --user 0 steps: - - run: yum update && yum install -y clang + - run: yum update && yum install -y clang lld - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2022-06-01 --profile minimal -y - uses: actions/checkout@v2 - run: python3 -m pip install --user --upgrade pip "maturin>=0.12.18,<0.13" wheel @@ -36,7 +36,9 @@ jobs: - run: ./integration/run thread - run: ./integration/run http - run: git config --global --add safe.directory /__w/orjson/orjson - - run: ./ci/deploy target/wheels/*.whl + - name: deploy + run: maturin upload --skip-existing --username "$MATURIN_USERNAME" target/wheels/orjson-*.whl + if: "startsWith(github.ref, 'refs/tags/')" env: MATURIN_USERNAME: ${{ secrets.TWINE_USERNAME }} MATURIN_PASSWORD: ${{ secrets.TWINE_PASSWORD }} diff --git a/.github/workflows/musllinux.yaml b/.github/workflows/musllinux.yaml index 0706b49b..357ce74f 100644 --- a/.github/workflows/musllinux.yaml +++ b/.github/workflows/musllinux.yaml @@ -50,18 +50,17 @@ jobs: name: Release runs-on: ubuntu-22.04 if: "startsWith(github.ref, 'refs/tags/')" - needs: [ linux-cross, musllinux ] + needs: [ musllinux ] steps: - uses: actions/download-artifact@v2 with: name: wheels - uses: actions/setup-python@v2 with: - python-version: 3.9 - - name: Publish to PyPI + python-version: "3.10" + - run: pip install "maturin>=0.12.18,<0.13" + - name: deploy + run: maturin upload --skip-existing --username "$MATURIN_USERNAME" *.whl env: - TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} - TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} - run: | - pip install --upgrade twine - twine upload --skip-existing * + MATURIN_USERNAME: ${{ secrets.TWINE_USERNAME }} + MATURIN_PASSWORD: ${{ secrets.TWINE_PASSWORD }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 3627703e..e60c29a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Changelog -## 3.7.0 - 2022-06-02 +## 3.7.1 - 2022-06-03 + +### Fixed + +- Type stubs for `orjson.JSONDecodeError` now inherit from +`json.JSONDecodeError` instead of `ValueError` +- Null-terminate the internal buffer of `orjson.dumps()` output. + +## 3.7.0 - 2022-06-03 ### Changed diff --git a/Cargo.lock b/Cargo.lock index 16d31940..9132f145 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -332,7 +332,7 @@ checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "orjson" -version = "3.7.0" +version = "3.7.1" dependencies = [ "ahash", "arrayvec", diff --git a/Cargo.toml b/Cargo.toml index 37a2b311..5d6cf277 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "orjson" -version = "3.7.0" +version = "3.7.1" authors = ["ijl "] description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy" edition = "2018"