commit 73bcdfe4f3bf3b10619ed26f3207da29dfdae843
parent 3bbd860756986c3c0412c87428746f4c6aa0f9b1
Author: Árni Dagur <arni@dagur.eu>
Date: Tue, 12 Jan 2021 00:04:31 +0000
Merge pull request #21 from ArniDagur/update-pyo3-0.13
Update PyO3 to 0.13
Diffstat:
4 files changed, 22 insertions(+), 71 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,15 +40,8 @@ jobs:
strategy:
fail-fast: false
matrix:
- python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+ python-version: [3.6, 3.7, 3.8, 3.9]
os: [ubuntu-latest, macos-latest, windows-latest]
- exclude:
- # There is a known issue where Python C extensions
- # can not be built on Python 3.5 on Windows.
- # https://github.com/actions/virtual-environments/issues/34
- # Therefore, ujson can't be compiled and the build would fail.
- - os: windows-latest
- python-version: 3.5
steps:
- name: Checkout
@@ -79,28 +72,16 @@ jobs:
run: poetry run maturin develop --release
- name: Run Python tests
- if: matrix.python-version != 3.5
run: poetry run pytest -vv --color=yes
- - name: Run Python tests (skip typestub tests)
- if: matrix.python-version == 3.5
- run: poetry run pytest -vv --color=yes --ignore=tests/test_typestubs.py
-
python-publish:
needs: build
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
- python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+ python-version: [3.6, 3.7, 3.8, 3.9]
os: [ubuntu-latest, macos-latest, windows-latest]
- exclude:
- # There is a known issue where Python C extensions
- # can not be built on Python 3.5 on Windows.
- # https://github.com/actions/virtual-environments/issues/34
- # Therefore, ujson can't be compiled and the build would fail.
- - os: windows-latest
- python-version: 3.5
steps:
- uses: actions/checkout@v1
@@ -109,7 +90,7 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- - uses: actions/setup-python@v2
+ - uses: actions/setup-python@v2
if: matrix.python-version == 3.9
with:
python-version: '3.9.0-alpha - 3.9.0'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,10 +11,12 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
### New
### Changes
+* Updated PyO3 to version `0.13`.
### Fixes
### Breaks
+* Dropped Python `3.5` support.
## 0.4.0 - (2020-12-16)
diff --git a/Cargo.lock b/Cargo.lock
@@ -264,24 +264,10 @@ dependencies = [
[[package]]
name = "indoc"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
-dependencies = [
- "indoc-impl",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "indoc-impl"
-version = "0.3.6"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
+checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
dependencies = [
- "proc-macro-hack",
- "proc-macro2 1.0.24",
- "quote 1.0.7",
- "syn 1.0.54",
"unindent",
]
@@ -476,22 +462,9 @@ dependencies = [
[[package]]
name = "paste"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
-dependencies = [
- "paste-impl",
- "proc-macro-hack",
-]
-
-[[package]]
-name = "paste-impl"
-version = "0.1.18"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
-dependencies = [
- "proc-macro-hack",
-]
+checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
[[package]]
name = "percent-encoding"
@@ -518,12 +491,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
-name = "proc-macro-hack"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
-
-[[package]]
name = "proc-macro2"
version = "0.4.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -579,38 +546,39 @@ dependencies = [
[[package]]
name = "pyo3"
-version = "0.12.4"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf6bbbe8f70d179260b3728e5d04eb012f4f0c7988e58c11433dd689cecaa72e"
+checksum = "00ca634cf3acd58a599b535ed6cb188223298977d471d146121792bfa23b754c"
dependencies = [
+ "cfg-if 1.0.0",
"ctor",
"indoc",
"inventory",
"libc",
"parking_lot",
"paste",
- "pyo3cls",
+ "pyo3-macros",
"unindent",
]
[[package]]
-name = "pyo3-derive-backend"
-version = "0.12.4"
+name = "pyo3-macros"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10ecd0eb6ed7b3d9965b4f4370b5b9e99e3e5e8742000e1c452c018f8c2a322f"
+checksum = "483ac516dbda6789a5b4be0271e7a31b9ad4ec8c0a5955050e8076f72bdbef8f"
dependencies = [
- "proc-macro2 1.0.24",
+ "pyo3-macros-backend",
"quote 1.0.7",
"syn 1.0.54",
]
[[package]]
-name = "pyo3cls"
-version = "0.12.4"
+name = "pyo3-macros-backend"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d344fdaa6a834a06dd1720ff104ea12fe101dad2e8db89345af9db74c0bb11a0"
+checksum = "15230cabcda008f03565ed8bac40f094cbb5ee1b46e6551f1ec3a0e922cf7df9"
dependencies = [
- "pyo3-derive-backend",
+ "proc-macro2 1.0.24",
"quote 1.0.7",
"syn 1.0.54",
]
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ debug = true
[dependencies]
adblock = { version = "=0.3.4", default-features = false, features = ["full-regex-handling", "embedded-domain-resolver"] }
-pyo3 = "0.12"
+pyo3 = "0.13"
[lib]
name = "adblock"
