Skip to content

Commit

Permalink
Merge pull request #8 from tamuhey/iss7
Browse files Browse the repository at this point in the history
Support python3.10, 3.11
  • Loading branch information
tamuhey authored Jan 3, 2023
2 parents fd90e07 + 0a71aec commit 7dfef0b
Show file tree
Hide file tree
Showing 8 changed files with 239 additions and 324 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v1
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
# ubuntu wheel is built in `manylinux_build.yml`
os: [macos-latest, windows-latest]

Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/manylinux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version:
- 3.6
- 3.7
- 3.8
- 3.9
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
container:
image: quay.io/pypa/manylinux2010_x86_64
image: quay.io/pypa/manylinux2014_x86_64
env:
PATH: /root/.cargo/bin:/root/.local/bin:/opt/python/cp36-cp36m/bin:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/rh/devtoolset-2/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/python/cp35-cp35m/bin:/opt/python/cp36-cp36m/bin:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/rh/devtoolset-8/root/usr/bin
PATH: /root/.cargo/bin:/root/.local/bin:/opt/python/cp36-cp36m/bin:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/rh/devtoolset-2/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/python/cp35-cp35m/bin:/opt/python/cp36-cp36m/bin:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp310-cp310/bin:/opt/rh/devtoolset-8/root/usr/bin:/opt/_internal/cpython-3.11.1/bin:/opt/_internal/cpython-3.10.1/bin
options: --user root
env:
HOME: /root
Expand All @@ -27,6 +23,8 @@ jobs:
- name: Install rust
run: |
curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
- name: install gcc
run: yum -y install gcc
- name: Test rust lib
run: cargo test

Expand Down
2 changes: 1 addition & 1 deletion python/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,4 @@ Cargo.lock
# These are backup files generated by rustfmt
**/*.rs.bk


/.venv37
4 changes: 2 additions & 2 deletions python/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
textspan = "0.5.2"
textspanrs = { package = "textspan", version = "0.5.2"}

[lib]
name = "textspan"
crate-type = ["cdylib"]

[dependencies.pyo3]
version = "^0.13"
version = "0.17.3"
features = ["extension-module"]
Loading

0 comments on commit 7dfef0b

Please sign in to comment.