Skip to content

Commit e31daa7

Browse files
committed
require Python 3.9, compile to ARM on CircleCI
1 parent 2355e07 commit e31daa7

File tree

3 files changed

+29
-42
lines changed

3 files changed

+29
-42
lines changed

.circleci/config.yml

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,33 @@ jobs:
8484
- store_artifacts: *store-wheel
8585
- persist_to_workspace: *persist-wheel
8686

87-
build-linux-wheel:
87+
build-linux-x64-wheel:
8888
docker:
89-
- image: quay.io/pypa/manylinux2014_x86_64:latest
89+
- image: messense/manylinux2014-cross:x86_64
9090
steps:
9191
- checkout
9292
- rust/install
9393
- run:
9494
name: Install Maturin and Build wheel
9595
command: |
9696
cd src/python_wrapper
97-
PYBIN_DIR="/opt/python/cp37-cp37m/bin"
97+
PYBIN_DIR="/opt/python/cp39-cp39/bin"
98+
"${PYBIN_DIR}/pip" install maturin
99+
"${PYBIN_DIR}/maturin" build --bindings=pyo3
100+
- store_artifacts: *store-wheel
101+
- persist_to_workspace: *persist-wheel
102+
103+
build-linux-aarch-wheel:
104+
docker:
105+
- image: messense/manylinux2014-cross:aarch64
106+
steps:
107+
- checkout
108+
- rust/install
109+
- run:
110+
name: Install Maturin and Build wheel
111+
command: |
112+
cd src/python_wrapper
113+
PYBIN_DIR="/opt/python/cp39-cp39/bin"
98114
"${PYBIN_DIR}/pip" install maturin
99115
"${PYBIN_DIR}/maturin" build --bindings=pyo3
100116
- store_artifacts: *store-wheel
@@ -135,7 +151,7 @@ jobs:
135151

136152
integration-test-linux:
137153
docker:
138-
- image: python:3.7
154+
- image: python:3.9
139155
steps:
140156
- attach_workspace:
141157
at: .
@@ -218,38 +234,9 @@ jobs:
218234
workflows:
219235
unit-test-build-and-integration-test:
220236
jobs:
221-
- unit-tests
222-
- build-linux-wheel:
223-
requires:
224-
- unit-tests
225-
- build-macos-wheel:
226-
requires:
227-
- unit-tests
228-
- build-windows-wheel:
229-
requires:
230-
- unit-tests
237+
- build-linux-x64-wheel
238+
- build-linux-aarch-wheel
231239
- integration-test-linux:
232240
requires:
233-
- build-linux-wheel
234-
- integration-test-macos:
235-
requires:
236-
- build-macos-wheel
237-
- integration-test-windows:
238-
requires:
239-
- build-windows-wheel
240-
- publish-to-testpypi:
241-
requires:
242-
- integration-test-linux
243-
- integration-test-macos
244-
- integration-test-windows
245-
filters:
246-
branches:
247-
only: master
248-
- publish-to-pypi:
249-
requires:
250-
- integration-test-linux
251-
- integration-test-macos
252-
- integration-test-windows
253-
filters:
254-
branches:
255-
only: production
241+
- build-linux-x64-wheel
242+
- build-linux-aarch-wheel

src/python_wrapper/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ name = "cvldoc_parser"
88
crate-type = ["cdylib"]
99

1010
[dependencies]
11-
pyo3 = { version = "0.19", features = ["extension-module", "abi3-py37"] }
11+
pyo3 = { version = "0.20", features = ["extension-module", "abi3-py39"] }
1212
cvldoc_parser_core = { path = "../.." }
1313
color-eyre = "0.6.2"
1414
indoc = "2"
1515
itertools = "0.10.5"
1616
lsp-types = "0.94"
1717
serde_json = "1"
1818
serde = { version = "1", features = ["derive"] }
19-
pythonize = "0.19.0"
19+
pythonize = "0.20"

src/python_wrapper/pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[build-system]
2-
requires = ["maturin>=1.2.3"]
2+
requires = ["maturin>=1.5.0"]
33
build-backend = "maturin"
44

55
[project]
66
name = "cvldoc_parser"
7-
version = "2.0.0b2"
8-
requires-python = ">=3.7"
7+
version = "2.0.0b3"
8+
requires-python = ">=3.9"
99
classifiers = [
1010
"Programming Language :: Rust",
1111
"Programming Language :: Python :: Implementation :: CPython",

0 commit comments

Comments
 (0)