Skip to content
This repository was archived by the owner on Sep 14, 2023. It is now read-only.

Commit bc73e21

Browse files
packysaucemre
authored andcommitted
[bump_pyo3_version] Update to pyo3 0.8.0 and maturin (#59)
1 parent 0a64b2d commit bc73e21

11 files changed

Lines changed: 496 additions & 8347 deletions

File tree

Cargo.lock

Lines changed: 239 additions & 124 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[package]
22
name = "hyperjson"
3-
version = "0.2.0"
3+
version = "0.2.1"
44
authors = ["Matthias Endler <[email protected]>"]
55

66
[dependencies]
7-
serde_json = "1.0.13"
8-
failure = "0.1.1"
9-
serde = "1.0.53"
10-
serde_derive = "1.0.53"
7+
serde_json = "1.0.40"
8+
failure = "0.1.5"
9+
serde = "1.0.101"
10+
serde_derive = "1.0.101"
1111

1212
[dependencies.pyo3]
13-
version = "0.6.0-alpha.2"
13+
version = "0.8.0"
1414

1515
[lib]
1616
name = "hyperjson"

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ help: ## This help message
99

1010
.PHONY: build
1111
build: nightly dev-packages ## Builds Rust code and hyperjson Python modules
12-
pipenv run pyo3-pack build
12+
pipenv run maturin build
1313

1414
.PHONY: build-release
1515
build-release: nightly dev-packages ## Build hyperjson module in release mode
16-
pipenv run pyo3-pack build --release
16+
pipenv run maturin build --release
1717

1818
.PHONY: nightly
1919
nightly: ## Set rust compiler to nightly version
2020
rustup override set nightly
2121

2222
.PHONY: install
2323
install: nightly dev-packages ## Install hyperjson module into current virtualenv
24-
pipenv run pyo3-pack develop
24+
pipenv run maturin develop
2525

2626
.PHONY: publish
2727
publish: ## Publish crate on Pypi
28-
pipenv run pyo3-pack publish
28+
pipenv run maturin publish
2929

3030
.PHONY: clean
3131
clean: ## Clean up build artifacts

Pipfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ yajl = "*"
1313
python-rapidjson = "*"
1414
wheel = "*"
1515
pylint = "*"
16-
matplotlib = "*"
16+
# pinned for py3.5 support
17+
matplotlib = "==3.0.3"
1718
hypothesis = "*"
1819
autopep8 = "*"
19-
pyo3-pack = "*"
20+
maturin = "*"
2021

2122
[packages]
2223

Pipfile.lock

Lines changed: 228 additions & 225 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ main() {
99
which rustc
1010
rustc --version
1111
pip install pipenv
12-
cargo install pyo3-pack
12+
cargo install maturin
1313
make install
1414
pipenv graph
1515
}

0 commit comments

Comments
 (0)