Skip to content

Update Rust dependencies #72

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.

Sign up for GitHub

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

Merged
ArniDagur merged 1 commit into from
Jul 17, 2022
Merged

Update Rust dependencies #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 23 additions & 19 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,19 @@ jobs:
command: fmt
args: -- --check

- name: Lint with clippy
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-targets --all-features -- -D clippy::all
# Disabled because of https://github.com/rust-lang/rust-clippy/issues/8971
# - name: Lint with clippy
# uses: actions-rs/cargo@v1
# with:
# command: clippy
# args: --all-targets --all-features -- -D clippy::all

- name: Lint with Black
run: pip install black && black --check .

- name: Lint with mypy
run: pip install mypy && mypy --non-interactive --install-types --ignore-missing-imports .

macos:
runs-on: macos-latest
needs: lint
Expand All @@ -43,7 +47,7 @@ jobs:

- uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
Expand All @@ -68,7 +72,7 @@ jobs:
PYO3_CROSS_LIB_DIR: /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/3.8/lib
run: |
# Build wheels
maturin build -i python --release --universal2 --out dist --no-sdist
maturin build -i python --release --universal2 --out dist
pip install adblock --no-index --find-links dist --force-reinstall

- name: Run PyTest
Expand Down Expand Up @@ -101,7 +105,7 @@ jobs:

- uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7
architecture: ${{ matrix.platform.python-architecture }}

- name: Install Rust toolchain
Expand All @@ -117,7 +121,7 @@ jobs:

- name: Build wheels
run: |
maturin build -i python --release --out dist --no-sdist --target ${{ matrix.platform.target }}
maturin build -i python --release --out dist --target ${{ matrix.platform.target }}
pip install adblock --no-index --find-links dist --force-reinstall

- name: Run PyTest
Expand All @@ -143,33 +147,33 @@ jobs:
platform:
[
{
toolchain: "1.49",
toolchain: "1.53",
manylinux: "2010",
target: "x86_64-unknown-linux-gnu",
arch: "x86_64",
python-version: "3.6"
python-version: "3.7"
},
{
toolchain: "nightly",
manylinux: "2010",
target: "x86_64-unknown-linux-gnu",
arch: "x86_64",
python-version: "3.6"
python-version: "3.7"
},
{
toolchain: "stable",
manylinux: "2010",
target: "x86_64-unknown-linux-gnu",
arch: "x86_64",
python-version: "3.6"
python-version: "3.7"
},
{
toolchain: "stable",
manylinux: "2010",
target: "x86_64-unknown-linux-gnu",
arch: "x86_64",
python-version: "3.10"
},
}
]
steps:
- uses: actions/checkout@v2
Expand All @@ -184,7 +188,7 @@ jobs:
source ~/.cargo/env
export PATH=/opt/python/cp38-cp38/bin:$PATH
pip install maturin
maturin build -i python --release --out dist --no-sdist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }}
maturin build -i python --release --out dist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }}
' > build-wheel.sh
chmod +x build-wheel.sh
docker run --rm -v "$PWD":/io -w /io quay.io/pypa/manylinux${{ matrix.platform.manylinux }}_${{ matrix.platform.arch }} bash build-wheel.sh
Expand Down Expand Up @@ -234,23 +238,23 @@ jobs:

- uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7

- name: Build Wheels
run: |
echo 'curl -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
source ~/.cargo/env
rustup target add ${{ matrix.platform.target }}
maturin build -i python --release --out dist --no-sdist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }}
maturin build -i python --release --out dist --target ${{ matrix.platform.target }} --manylinux ${{ matrix.platform.manylinux }}
' > build-wheel.sh
chmod +x build-wheel.sh
docker run --rm -v "$PWD":/io -w /io messense/manylinux2014-cross:${{ matrix.platform.arch }} bash build-wheel.sh

- uses: uraimo/run-on-arch-action@v2.0.5
- uses: uraimo/run-on-arch-action@v2.2.0
name: Install built wheel
with:
arch: ${{ matrix.platform.arch }}
distro: ubuntu18.04
distro: ubuntu22.04
# Mount the dist directory as /artifacts in the container
dockerRunArgs: |
--volume "${PWD}/dist:/artifacts"
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch

## Unreleased
---
### Changes
* Update PyO3 dependency to `0.16`.
* Update upstream dependency to `0.5.6`.

### Breaks
* Minimum Rust version is now `1.53`.
* Minimum Python version is now `3.7`.


## 0.5.2 - (2022-03-01)
---
Expand Down
Loading