Skip to content
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

Upgrade pyo3 to 0.16 #956

Merged
merged 8 commits into from
May 5, 2022
Merged

Upgrade pyo3 to 0.16 #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
98c8786
Upgrade pyo3 to 0.15
messense Mar 10, 2021
a532fd6
Upgrade pyo3 to 0.16
messense Mar 21, 2022
0d942cd
Install Python before running cargo clippy
messense Mar 21, 2022
69b1f6b
Fix clippy warnings
messense Mar 21, 2022
fec2512
Use `PyArray_Check` instead of downcasting to `PyArray1<u8>`
messense Mar 21, 2022
2343a7c
Enable `auto-initialize` of pyo3 to fix `cargo test
messense Mar 22, 2022
7341bb4
Fix some test cases
messense Mar 22, 2022
b2955fb
Refactor and add SAFETY comments to `PyArrayUnicode`
messense Mar 22, 2022
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
13 changes: 7 additions & 6 deletions .github/workflows/python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ jobs:
toolchain: stable
components: rustfmt, clippy

- name: Install Python
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved this up because Ubuntu 18.04 comes with Python 3.6 and now we require Python 3.7.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was already setting up 3.9 before. where is 3.6/3.7 used that was broken ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it wasn't, see this build: https://github.com/huggingface/tokenizers/runs/5624656581?check_suite_focus=true

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahhh clippy is triggering it and it doesn't work after the upgrade !

So clippy was running against 3.6 Python interpreter, which is fine, since clippy wasn't running any python code anyway.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually clippy will trigger running build scripts, which in turn runs python code from pyo3-ffi: https://github.com/PyO3/pyo3/blob/main/pyo3-ffi/build.rs

uses: actions/setup-python@v2
with:
python-version: 3.9
architecture: "x64"


- name: Cache Cargo Registry
uses: actions/cache@v1
with:
Expand All @@ -88,12 +95,6 @@ jobs:
command: clippy
args: --manifest-path ./bindings/python/Cargo.toml --all-targets --all-features -- -D warnings

- name: Install Python
uses: actions/setup-python@v2
with:
python-version: 3.9
architecture: "x64"

- name: Install
working-directory: ./bindings/python
run: |
Expand Down
1 change: 0 additions & 1 deletion bindings/python/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ rustflags = [
"-C", "link-arg=dynamic_lookup",
"-C", "link-arg=-mmacosx-version-min=10.11",
]

Loading