summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÁrni Dagur <arni@dagur.eu>2021-01-11 17:13:39 +0000
committerÁrni Dagur <arni@dagur.eu>2021-01-11 17:13:39 +0000
commitc301c37807319ccb7a38fdc8560b9a3b1317c1f9 (patch)
treebcbb255f1ceae79fb0b517ebef256d078069e1a6
parent3bbd860756986c3c0412c87428746f4c6aa0f9b1 (diff)
Update PyO3 to 0.13
-rw-r--r--.github/workflows/ci.yml25
-rw-r--r--CHANGELOG.md2
-rw-r--r--Cargo.lock64
-rw-r--r--Cargo.toml2
4 files changed, 22 insertions, 71 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a7074d4..43e7e20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,15 +40,8 @@ jobs:
40 strategy: 40 strategy:
41 fail-fast: false 41 fail-fast: false
42 matrix: 42 matrix:
43 python-version: [3.5, 3.6, 3.7, 3.8, 3.9] 43 python-version: [3.6, 3.7, 3.8, 3.9]
44 os: [ubuntu-latest, macos-latest, windows-latest] 44 os: [ubuntu-latest, macos-latest, windows-latest]
45 exclude:
46 # There is a known issue where Python C extensions
47 # can not be built on Python 3.5 on Windows.
48 # https://github.com/actions/virtual-environments/issues/34
49 # Therefore, ujson can't be compiled and the build would fail.
50 - os: windows-latest
51 python-version: 3.5
52 45
53 steps: 46 steps:
54 - name: Checkout 47 - name: Checkout
@@ -79,28 +72,16 @@ jobs:
79 run: poetry run maturin develop --release 72 run: poetry run maturin develop --release
80 73
81 - name: Run Python tests 74 - name: Run Python tests
82 if: matrix.python-version != 3.5
83 run: poetry run pytest -vv --color=yes 75 run: poetry run pytest -vv --color=yes
84 76
85 - name: Run Python tests (skip typestub tests)
86 if: matrix.python-version == 3.5
87 run: poetry run pytest -vv --color=yes --ignore=tests/test_typestubs.py
88
89 python-publish: 77 python-publish:
90 needs: build 78 needs: build
91 runs-on: ${{ matrix.os }} 79 runs-on: ${{ matrix.os }}
92 strategy: 80 strategy:
93 fail-fast: false 81 fail-fast: false
94 matrix: 82 matrix:
95 python-version: [3.5, 3.6, 3.7, 3.8, 3.9] 83 python-version: [3.6, 3.7, 3.8, 3.9]
96 os: [ubuntu-latest, macos-latest, windows-latest] 84 os: [ubuntu-latest, macos-latest, windows-latest]
97 exclude:
98 # There is a known issue where Python C extensions
99 # can not be built on Python 3.5 on Windows.
100 # https://github.com/actions/virtual-environments/issues/34
101 # Therefore, ujson can't be compiled and the build would fail.
102 - os: windows-latest
103 python-version: 3.5
104 steps: 85 steps:
105 - uses: actions/checkout@v1 86 - uses: actions/checkout@v1
106 87
@@ -109,7 +90,7 @@ jobs:
109 with: 90 with:
110 python-version: ${{ matrix.python-version }} 91 python-version: ${{ matrix.python-version }}
111 92
112 - uses: actions/setup-python@v2 93 - uses: actions/setup-python@v2
113 if: matrix.python-version == 3.9 94 if: matrix.python-version == 3.9
114 with: 95 with:
115 python-version: '3.9.0-alpha - 3.9.0' 96 python-version: '3.9.0-alpha - 3.9.0'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bd8cfa..e225fa9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,10 +11,12 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a Ch
11### New 11### New
12 12
13### Changes 13### Changes
14* Updated PyO3 to version `0.13`.
14 15
15### Fixes 16### Fixes
16 17
17### Breaks 18### Breaks
19* Dropped Python `3.5` support.
18 20
19 21
20## 0.4.0 - (2020-12-16) 22## 0.4.0 - (2020-12-16)
diff --git a/Cargo.lock b/Cargo.lock
index fe787aa..f94ffe6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -264,24 +264,10 @@ dependencies = [
264 264
265[[package]] 265[[package]]
266name = "indoc" 266name = "indoc"
267version = "0.3.6" 267version = "1.0.3"
268source = "registry+https://github.com/rust-lang/crates.io-index"
269checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
270dependencies = [
271 "indoc-impl",
272 "proc-macro-hack",
273]
274
275[[package]]
276name = "indoc-impl"
277version = "0.3.6"
278source = "registry+https://github.com/rust-lang/crates.io-index" 268source = "registry+https://github.com/rust-lang/crates.io-index"
279checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" 269checksum = "e5a75aeaaef0ce18b58056d306c27b07436fbb34b8816c53094b76dd81803136"
280dependencies = [ 270dependencies = [
281 "proc-macro-hack",
282 "proc-macro2 1.0.24",
283 "quote 1.0.7",
284 "syn 1.0.54",
285 "unindent", 271 "unindent",
286] 272]
287 273
@@ -476,22 +462,9 @@ dependencies = [
476 462
477[[package]] 463[[package]]
478name = "paste" 464name = "paste"
479version = "0.1.18" 465version = "1.0.4"
480source = "registry+https://github.com/rust-lang/crates.io-index"
481checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
482dependencies = [
483 "paste-impl",
484 "proc-macro-hack",
485]
486
487[[package]]
488name = "paste-impl"
489version = "0.1.18"
490source = "registry+https://github.com/rust-lang/crates.io-index" 466source = "registry+https://github.com/rust-lang/crates.io-index"
491checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" 467checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
492dependencies = [
493 "proc-macro-hack",
494]
495 468
496[[package]] 469[[package]]
497name = "percent-encoding" 470name = "percent-encoding"
@@ -518,12 +491,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
518checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" 491checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
519 492
520[[package]] 493[[package]]
521name = "proc-macro-hack"
522version = "0.5.19"
523source = "registry+https://github.com/rust-lang/crates.io-index"
524checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
525
526[[package]]
527name = "proc-macro2" 494name = "proc-macro2"
528version = "0.4.30" 495version = "0.4.30"
529source = "registry+https://github.com/rust-lang/crates.io-index" 496source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -579,38 +546,39 @@ dependencies = [
579 546
580[[package]] 547[[package]]
581name = "pyo3" 548name = "pyo3"
582version = "0.12.4" 549version = "0.13.1"
583source = "registry+https://github.com/rust-lang/crates.io-index" 550source = "registry+https://github.com/rust-lang/crates.io-index"
584checksum = "bf6bbbe8f70d179260b3728e5d04eb012f4f0c7988e58c11433dd689cecaa72e" 551checksum = "00ca634cf3acd58a599b535ed6cb188223298977d471d146121792bfa23b754c"
585dependencies = [ 552dependencies = [
553 "cfg-if 1.0.0",
586 "ctor", 554 "ctor",
587 "indoc", 555 "indoc",
588 "inventory", 556 "inventory",
589 "libc", 557 "libc",
590 "parking_lot", 558 "parking_lot",
591 "paste", 559 "paste",
592 "pyo3cls", 560 "pyo3-macros",
593 "unindent", 561 "unindent",
594] 562]
595 563
596[[package]] 564[[package]]
597name = "pyo3-derive-backend" 565name = "pyo3-macros"
598version = "0.12.4" 566version = "0.13.1"
599source = "registry+https://github.com/rust-lang/crates.io-index" 567source = "registry+https://github.com/rust-lang/crates.io-index"
600checksum = "10ecd0eb6ed7b3d9965b4f4370b5b9e99e3e5e8742000e1c452c018f8c2a322f" 568checksum = "483ac516dbda6789a5b4be0271e7a31b9ad4ec8c0a5955050e8076f72bdbef8f"
601dependencies = [ 569dependencies = [
602 "proc-macro2 1.0.24", 570 "pyo3-macros-backend",
603 "quote 1.0.7", 571 "quote 1.0.7",
604 "syn 1.0.54", 572 "syn 1.0.54",
605] 573]
606 574
607[[package]] 575[[package]]
608name = "pyo3cls" 576name = "pyo3-macros-backend"
609version = "0.12.4" 577version = "0.13.1"
610source = "registry+https://github.com/rust-lang/crates.io-index" 578source = "registry+https://github.com/rust-lang/crates.io-index"
611checksum = "d344fdaa6a834a06dd1720ff104ea12fe101dad2e8db89345af9db74c0bb11a0" 579checksum = "15230cabcda008f03565ed8bac40f094cbb5ee1b46e6551f1ec3a0e922cf7df9"
612dependencies = [ 580dependencies = [
613 "pyo3-derive-backend", 581 "proc-macro2 1.0.24",
614 "quote 1.0.7", 582 "quote 1.0.7",
615 "syn 1.0.54", 583 "syn 1.0.54",
616] 584]
diff --git a/Cargo.toml b/Cargo.toml
index 372030b..482c01f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ debug = true
11 11
12[dependencies] 12[dependencies]
13adblock = { version = "=0.3.4", default-features = false, features = ["full-regex-handling", "embedded-domain-resolver"] } 13adblock = { version = "=0.3.4", default-features = false, features = ["full-regex-handling", "embedded-domain-resolver"] }
14pyo3 = "0.12" 14pyo3 = "0.13"
15 15
16[lib] 16[lib]
17name = "adblock" 17name = "adblock"