From e0f6f26db147658d98dbc1f100d46f1f8d99ff5d Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 16:26:39 -0700 Subject: [PATCH 1/6] Drop python 3.5 support --- .circleci/config.yml | 49 -------------------------------------------- setup.py | 1 - tox.ini | 5 ++--- 3 files changed, 2 insertions(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f87dab3..53aecd2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,12 +30,6 @@ jobs: - image: circleci/python:3.6 environment: TOXENV: lint - py35-core: - <<: *common - docker: - - image: circleci/python:3.5 - environment: - TOXENV: py35-core py36-core: <<: *common docker: @@ -60,12 +54,6 @@ jobs: - image: pypy environment: TOXENV: pypy3-core - py35-backends-coincurve7: - <<: *common - docker: - - image: circleci/python:3.5 - environment: - TOXENV: py35-backends-coincurve7 py36-backends-coincurve7: <<: *common docker: @@ -84,12 +72,6 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve7 - py35-backends-coincurve8: - <<: *common - docker: - - image: circleci/python:3.5 - environment: - TOXENV: py35-backends-coincurve8 py36-backends-coincurve8: <<: *common docker: @@ -108,12 +90,6 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve8 - py35-backends-coincurve9: - <<: *common - docker: - - image: circleci/python:3.5 - environment: - TOXENV: py35-backends-coincurve9 py36-backends-coincurve9: <<: *common docker: @@ -132,12 +108,6 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve9 - py35-backends-coincurve10: - <<: *common - docker: - - image: circleci/python:3.5 - environment: - TOXENV: py35-backends-coincurve10 py36-backends-coincurve10: <<: *common docker: @@ -156,12 +126,6 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve10 - py35-backends-coincurve11: - <<: *common - docker: - - image: circleci/python:3.5 - environment: - TOXENV: py35-backends-coincurve11 py36-backends-coincurve11: <<: *common docker: @@ -180,12 +144,6 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve11 - py35-backends-coincurve12: - <<: *common - docker: - - image: circleci/python:3.5 - environment: - TOXENV: py35-backends-coincurve12 py36-backends-coincurve12: <<: *common docker: @@ -209,32 +167,25 @@ workflows: test: jobs: - lint - - py35-core - py36-core - py37-core - py38-core - pypy3-core - - py35-backends-coincurve7 - py36-backends-coincurve7 - py37-backends-coincurve7 - py38-backends-coincurve7 - - py35-backends-coincurve8 - py36-backends-coincurve8 - py37-backends-coincurve8 - py38-backends-coincurve8 - - py35-backends-coincurve9 - py36-backends-coincurve9 - py37-backends-coincurve9 - py38-backends-coincurve9 - - py35-backends-coincurve10 - py36-backends-coincurve10 - py37-backends-coincurve10 - py38-backends-coincurve10 - - py35-backends-coincurve11 - py36-backends-coincurve11 - py37-backends-coincurve11 - py38-backends-coincurve11 - - py35-backends-coincurve12 - py36-backends-coincurve12 - py37-backends-coincurve12 - py38-backends-coincurve12 diff --git a/setup.py b/setup.py index 24a3d86..3656ce8 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,6 @@ 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', diff --git a/tox.ini b/tox.ini index 053b11e..c5c6236 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist= - py{35,36,37,38}-core - py{35,36,37,38}-backends-coincurve{7,8,9,10,11,12} + py{36,37,38}-core + py{36,37,38}-backends-coincurve{7,8,9,10,11,12} pypy3-core lint @@ -24,7 +24,6 @@ deps = .[test] setenv = backends: REQUIRE_COINCURVE=True basepython = - py35: python3.5 py36: python3.6 py37: python3.7 py38: python3.8 From fc2100130a97be6a036bac46d8c0e6343f878048 Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 16:30:59 -0700 Subject: [PATCH 2/6] Add support for python 3.9 --- .circleci/config.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++ setup.py | 1 + tox.ini | 5 +++-- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53aecd2..ae58b8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,6 +48,12 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-core + py39-core: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-core pypy3-core: <<: *common docker: @@ -72,6 +78,12 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve7 + py39-backends-coincurve7: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve7 py36-backends-coincurve8: <<: *common docker: @@ -90,6 +102,12 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve8 + py39-backends-coincurve8: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve8 py36-backends-coincurve9: <<: *common docker: @@ -108,6 +126,12 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve9 + py39-backends-coincurve9: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve9 py36-backends-coincurve10: <<: *common docker: @@ -126,6 +150,12 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve10 + py39-backends-coincurve10: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve10 py36-backends-coincurve11: <<: *common docker: @@ -144,6 +174,12 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve11 + py39-backends-coincurve11: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve11 py36-backends-coincurve12: <<: *common docker: @@ -162,6 +198,12 @@ jobs: - image: circleci/python:3.8 environment: TOXENV: py38-backends-coincurve12 + py39-backends-coincurve12: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve12 workflows: version: 2 test: @@ -170,22 +212,29 @@ workflows: - py36-core - py37-core - py38-core + - py39-core - pypy3-core - py36-backends-coincurve7 - py37-backends-coincurve7 - py38-backends-coincurve7 + - py39-backends-coincurve7 - py36-backends-coincurve8 - py37-backends-coincurve8 - py38-backends-coincurve8 + - py39-backends-coincurve8 - py36-backends-coincurve9 - py37-backends-coincurve9 - py38-backends-coincurve9 + - py39-backends-coincurve9 - py36-backends-coincurve10 - py37-backends-coincurve10 - py38-backends-coincurve10 + - py39-backends-coincurve10 - py36-backends-coincurve11 - py37-backends-coincurve11 - py38-backends-coincurve11 + - py39-backends-coincurve11 - py36-backends-coincurve12 - py37-backends-coincurve12 - py38-backends-coincurve12 + - py39-backends-coincurve12 diff --git a/setup.py b/setup.py index 3656ce8..2bfc3d6 100644 --- a/setup.py +++ b/setup.py @@ -72,5 +72,6 @@ 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', ], ) diff --git a/tox.ini b/tox.ini index c5c6236..f6575bc 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist= - py{36,37,38}-core - py{36,37,38}-backends-coincurve{7,8,9,10,11,12} + py{36,37,38,39}-core + py{36,37,38,39}-backends-coincurve{7,8,9,10,11,12} pypy3-core lint @@ -27,6 +27,7 @@ basepython = py36: python3.6 py37: python3.7 py38: python3.8 + py39: python3.9 pypy3: pypy3 [testenv:lint] From 1d258ca46dc0af7d76a771b457e9f08f857ead25 Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 16:43:52 -0700 Subject: [PATCH 3/6] Check python 3.10 support --- .circleci/config.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++ setup.py | 1 + tox.ini | 5 +++-- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ae58b8d..602b7fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,6 +54,12 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-core + py310-core: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-core pypy3-core: <<: *common docker: @@ -84,6 +90,12 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-backends-coincurve7 + py310-backends-coincurve7: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve7 py36-backends-coincurve8: <<: *common docker: @@ -108,6 +120,12 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-backends-coincurve8 + py310-backends-coincurve8: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve8 py36-backends-coincurve9: <<: *common docker: @@ -132,6 +150,12 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-backends-coincurve9 + py310-backends-coincurve9: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve9 py36-backends-coincurve10: <<: *common docker: @@ -156,6 +180,12 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-backends-coincurve10 + py310-backends-coincurve10: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve10 py36-backends-coincurve11: <<: *common docker: @@ -180,6 +210,12 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-backends-coincurve11 + py310-backends-coincurve11: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve11 py36-backends-coincurve12: <<: *common docker: @@ -204,6 +240,12 @@ jobs: - image: circleci/python:3.9 environment: TOXENV: py39-backends-coincurve12 + py310-backends-coincurve12: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve12 workflows: version: 2 test: @@ -213,28 +255,35 @@ workflows: - py37-core - py38-core - py39-core + - py310-core - pypy3-core - py36-backends-coincurve7 - py37-backends-coincurve7 - py38-backends-coincurve7 - py39-backends-coincurve7 + - py310-backends-coincurve7 - py36-backends-coincurve8 - py37-backends-coincurve8 - py38-backends-coincurve8 - py39-backends-coincurve8 + - py310-backends-coincurve8 - py36-backends-coincurve9 - py37-backends-coincurve9 - py38-backends-coincurve9 - py39-backends-coincurve9 + - py310-backends-coincurve9 - py36-backends-coincurve10 - py37-backends-coincurve10 - py38-backends-coincurve10 - py39-backends-coincurve10 + - py310-backends-coincurve10 - py36-backends-coincurve11 - py37-backends-coincurve11 - py38-backends-coincurve11 - py39-backends-coincurve11 + - py310-backends-coincurve11 - py36-backends-coincurve12 - py37-backends-coincurve12 - py38-backends-coincurve12 - py39-backends-coincurve12 + - py310-backends-coincurve12 diff --git a/setup.py b/setup.py index 2bfc3d6..f092975 100644 --- a/setup.py +++ b/setup.py @@ -73,5 +73,6 @@ 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', ], ) diff --git a/tox.ini b/tox.ini index f6575bc..54f3f7e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist= - py{36,37,38,39}-core - py{36,37,38,39}-backends-coincurve{7,8,9,10,11,12} + py{36,37,38,39,310}-core + py{36,37,38,39,310}-backends-coincurve{7,8,9,10,11,12} pypy3-core lint @@ -28,6 +28,7 @@ basepython = py37: python3.7 py38: python3.8 py39: python3.9 + py310: python3.10 pypy3: pypy3 [testenv:lint] From dac3c9c37f9dab7cc66b400362fe1d5cca47b765 Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 16:46:21 -0700 Subject: [PATCH 4/6] Bump pytest==6.2.5 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f092975..388aff4 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ "asn1tools>=0.146.2,<0.147", "factory-boy>=3.0.1,<3.1", "pyasn1>=0.4.5,<0.5", - "pytest==5.4.1", + "pytest==6.2.5", "hypothesis>=5.10.3, <6.0.0", "eth-hash[pysha3];implementation_name=='cpython'", "eth-hash[pycryptodome];implementation_name=='pypy'", From 6c545221d6ae062edbce3d3f52c3de8dc768da8e Mon Sep 17 00:00:00 2001 From: kclowes Date: Fri, 19 Nov 2021 17:31:10 -0700 Subject: [PATCH 5/6] Test coincurve through v15 --- .circleci/config.yml | 105 +++++++++++++++++++++++++++++++++++++++++++ setup.py | 2 +- tox.ini | 5 ++- 3 files changed, 110 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 602b7fc..ad12cfa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -246,6 +246,96 @@ jobs: - image: circleci/python:3.10 environment: TOXENV: py310-backends-coincurve12 + py36-backends-coincurve13: + <<: *common + docker: + - image: circleci/python:3.6 + environment: + TOXENV: py36-backends-coincurve13 + py37-backends-coincurve13: + <<: *common + docker: + - image: circleci/python:3.7 + environment: + TOXENV: py37-backends-coincurve13 + py38-backends-coincurve13: + <<: *common + docker: + - image: circleci/python:3.8 + environment: + TOXENV: py38-backends-coincurve13 + py39-backends-coincurve13: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve13 + py310-backends-coincurve13: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve13 + py36-backends-coincurve14: + <<: *common + docker: + - image: circleci/python:3.6 + environment: + TOXENV: py36-backends-coincurve14 + py37-backends-coincurve14: + <<: *common + docker: + - image: circleci/python:3.7 + environment: + TOXENV: py37-backends-coincurve14 + py38-backends-coincurve14: + <<: *common + docker: + - image: circleci/python:3.8 + environment: + TOXENV: py38-backends-coincurve14 + py39-backends-coincurve14: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve14 + py310-backends-coincurve14: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve14 + py36-backends-coincurve15: + <<: *common + docker: + - image: circleci/python:3.6 + environment: + TOXENV: py36-backends-coincurve15 + py37-backends-coincurve15: + <<: *common + docker: + - image: circleci/python:3.7 + environment: + TOXENV: py37-backends-coincurve15 + py38-backends-coincurve15: + <<: *common + docker: + - image: circleci/python:3.8 + environment: + TOXENV: py38-backends-coincurve15 + py39-backends-coincurve15: + <<: *common + docker: + - image: circleci/python:3.9 + environment: + TOXENV: py39-backends-coincurve15 + py310-backends-coincurve15: + <<: *common + docker: + - image: circleci/python:3.10 + environment: + TOXENV: py310-backends-coincurve15 workflows: version: 2 test: @@ -287,3 +377,18 @@ workflows: - py38-backends-coincurve12 - py39-backends-coincurve12 - py310-backends-coincurve12 + - py36-backends-coincurve13 + - py37-backends-coincurve13 + - py38-backends-coincurve13 + - py39-backends-coincurve13 + - py310-backends-coincurve13 + - py36-backends-coincurve14 + - py37-backends-coincurve14 + - py38-backends-coincurve14 + - py39-backends-coincurve14 + - py310-backends-coincurve14 + - py36-backends-coincurve15 + - py37-backends-coincurve15 + - py38-backends-coincurve15 + - py39-backends-coincurve15 + - py310-backends-coincurve15 diff --git a/setup.py b/setup.py index 388aff4..2e45bb9 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ deps = { 'coincurve': [ - 'coincurve>=7.0.0,<13.0.0', + 'coincurve>=7.0.0,<16.0.0', ], 'eth-keys': [ "eth-utils>=1.8.2,<2.0.0", diff --git a/tox.ini b/tox.ini index 54f3f7e..8898877 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist= py{36,37,38,39,310}-core - py{36,37,38,39,310}-backends-coincurve{7,8,9,10,11,12} + py{36,37,38,39,310}-backends-coincurve{7,8,9,10,11,12,13,14,15} pypy3-core lint @@ -21,6 +21,9 @@ deps = .[test] coincurve10: coincurve>=10.0.0,<11.0.0 coincurve11: coincurve>=11.0.0,<12.0.0 coincurve12: coincurve>=12.0.0,<13.0.0 + coincurve13: coincurve>=13.0.0,<14.0.0 + coincurve14: coincurve>=14.0.0,<15.0.0 + coincurve15: coincurve>=15.0.0,<16.0.0 setenv = backends: REQUIRE_COINCURVE=True basepython = From 36d0c7bada0f082bbd86b6cc4056dd425a9f2e83 Mon Sep 17 00:00:00 2001 From: kclowes Date: Mon, 22 Nov 2021 11:32:22 -0700 Subject: [PATCH 6/6] Fix deprecation warnings - add module scoping to fixtures --- tests/backends/test_backends.py | 2 +- tests/backends/test_native_backend_against_coincurve.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/backends/test_backends.py b/tests/backends/test_backends.py index 9035e67..e665207 100644 --- a/tests/backends/test_backends.py +++ b/tests/backends/test_backends.py @@ -46,7 +46,7 @@ def backend_id_fn(backend): return type(backend).__name__ -@pytest.fixture(params=backends, ids=backend_id_fn) +@pytest.fixture(params=backends, ids=backend_id_fn, scope='module') def key_api(request): return KeyAPI(backend=request.param) diff --git a/tests/backends/test_native_backend_against_coincurve.py b/tests/backends/test_native_backend_against_coincurve.py index 6d6ef24..2980386 100644 --- a/tests/backends/test_native_backend_against_coincurve.py +++ b/tests/backends/test_native_backend_against_coincurve.py @@ -31,12 +31,12 @@ MAX_EXAMPLES = 200 -@pytest.fixture +@pytest.fixture(scope='module') def native_key_api(): return KeyAPI(backend=NativeECCBackend()) -@pytest.fixture +@pytest.fixture(scope='module') def coincurve_key_api(): return KeyAPI(backend=CoinCurveECCBackend())