Skip to content

Commit 1284329

Browse files
kcloweskclowes
authored
Drop python 3.6 (#2343)
* Drop python 3.6 * Remove parity tests * Add newsfragment for py36 drop
1 parent f93336a commit 1284329

File tree

4 files changed

+11
-244
lines changed

4 files changed

+11
-244
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 229 deletions
Original file line numberDiff line numberDiff line change
@@ -57,44 +57,6 @@ docs_steps: &docs_steps
5757
- ~/.py-geth
5858
key: cache-docs-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
5959

60-
# parity_steps: &parity_steps
61-
# working_directory: ~/repo
62-
# steps:
63-
# - checkout
64-
# - restore_cache:
65-
# keys:
66-
# - cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
67-
# - run:
68-
# name: install dependencies
69-
# command: pip install --user tox
70-
# - run:
71-
# name: install parity if needed
72-
# command: |
73-
# pip install --user requests eth_utils tqdm eth-hash[pycryptodome]
74-
# echo "Job specifies Parity version $PARITY_VERSION"
75-
# python tests/integration/parity/install_parity.py $PARITY_VERSION
76-
# - run:
77-
# name: update parity deps from testing repo if needed
78-
# command: |
79-
# [ "`cat /etc/*release | grep jessie`" != "" ] && echo "On Jessie - installing missing deps..." || echo "Not on Jessie - doing nothing."
80-
# [ "`cat /etc/*release | grep jessie`" != "" ] || exit 0
81-
# echo "deb http://ftp.debian.org/debian testing main" > testing.list && sudo mv testing.list /etc/apt/sources.list.d/
82-
# sudo apt update
83-
# sudo apt-get -t testing install libstdc++6
84-
# - run:
85-
# name: run tox
86-
# command: ~/.local/bin/tox -r
87-
# - save_cache:
88-
# paths:
89-
# - .tox
90-
# - ~/.cache/pip
91-
# - ~/.local
92-
# - ./eggs
93-
# - ~/.ethash
94-
# - ~/.py-geth
95-
# - ~/.parity-bin
96-
# key: cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
97-
9860
geth_steps: &geth_steps
9961
working_directory: ~/repo
10062
steps:
@@ -247,105 +209,17 @@ jobs:
247209
lint:
248210
<<: *common
249211
docker:
250-
- image: circleci/python:3.6
212+
- image: circleci/python:3.9
251213
environment:
252214
TOXENV: lint
253215

254216
docs:
255217
<<: *docs_steps
256218
docker:
257-
- image: circleci/python:3.6
219+
- image: circleci/python:3.9
258220
environment:
259221
TOXENV: docs
260222

261-
py36-core:
262-
<<: *common
263-
docker:
264-
- image: circleci/python:3.6
265-
environment:
266-
TOXENV: py36-core
267-
268-
py36-ens:
269-
<<: *common
270-
docker:
271-
- image: circleci/python:3.6
272-
environment:
273-
TOXENV: py36-ens
274-
275-
py36-ethpm:
276-
<<: *ethpm_steps
277-
docker:
278-
- image: circleci/python:3.6
279-
environment:
280-
TOXENV: py36-ethpm
281-
# Please don't use this key for any shenanigans
282-
WEB3_INFURA_PROJECT_ID: 7707850c2fb7465ebe6f150d67182e22
283-
284-
py36-integration-goethereum-ipc:
285-
<<: *geth_steps
286-
docker:
287-
- image: circleci/python:3.6
288-
environment:
289-
TOXENV: py36-integration-goethereum-ipc
290-
GETH_VERSION: v1.10.13
291-
292-
py36-integration-goethereum-http:
293-
<<: *geth_steps
294-
docker:
295-
- image: circleci/python:3.6
296-
environment:
297-
TOXENV: py36-integration-goethereum-http
298-
GETH_VERSION: v1.10.13
299-
300-
py36-integration-goethereum-ws:
301-
<<: *geth_steps
302-
docker:
303-
- image: circleci/python:3.6
304-
environment:
305-
TOXENV: py36-integration-goethereum-ws
306-
GETH_VERSION: v1.10.13
307-
308-
# py36-integration-parity-ipc:
309-
# <<: *parity_steps
310-
# docker:
311-
# - image: circleci/python:3.6-stretch
312-
# environment:
313-
# TOXENV: py36-integration-parity-ipc
314-
# PARITY_VERSION: v2.3.5
315-
# PARITY_OS: linux
316-
317-
# py36-integration-parity-http:
318-
# <<: *parity_steps
319-
# docker:
320-
# - image: circleci/python:3.6-stretch
321-
# environment:
322-
# TOXENV: py36-integration-parity-http
323-
# PARITY_VERSION: v2.3.5
324-
# PARITY_OS: linux
325-
326-
# py36-integration-parity-ws:
327-
# <<: *parity_steps
328-
# docker:
329-
# - image: circleci/python:3.6-stretch
330-
# environment:
331-
# TOXENV: py36-integration-parity-ws
332-
# PARITY_VERSION: v2.3.5
333-
# PARITY_OS: linux
334-
335-
py36-integration-ethtester-pyevm:
336-
<<: *common
337-
docker:
338-
- image: circleci/python:3.6
339-
environment:
340-
TOXENV: py36-integration-ethtester
341-
ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend
342-
343-
py36-wheel-cli:
344-
<<: *common
345-
docker:
346-
- image: circleci/python:3.6
347-
environment:
348-
TOXENV: py36-wheel-cli
349223

350224
#
351225
# Python 3.7
@@ -397,33 +271,6 @@ jobs:
397271
TOXENV: py37-integration-goethereum-ws
398272
GETH_VERSION: v1.10.13
399273

400-
# py37-integration-parity-ipc:
401-
# <<: *parity_steps
402-
# docker:
403-
# - image: circleci/python:3.7-stretch
404-
# environment:
405-
# TOXENV: py37-integration-parity-ipc
406-
# PARITY_VERSION: v2.3.5
407-
# PARITY_OS: linux
408-
409-
# py37-integration-parity-http:
410-
# <<: *parity_steps
411-
# docker:
412-
# - image: circleci/python:3.7-stretch
413-
# environment:
414-
# TOXENV: py37-integration-parity-http
415-
# PARITY_VERSION: v2.3.5
416-
# PARITY_OS: linux
417-
418-
# py37-integration-parity-ws:
419-
# <<: *parity_steps
420-
# docker:
421-
# - image: circleci/python:3.7-stretch
422-
# environment:
423-
# TOXENV: py37-integration-parity-ws
424-
# PARITY_VERSION: v2.3.5
425-
# PARITY_OS: linux
426-
427274
py37-integration-ethtester-pyevm:
428275
<<: *common
429276
docker:
@@ -494,33 +341,6 @@ jobs:
494341
TOXENV: py38-integration-goethereum-ws
495342
GETH_VERSION: v1.10.13
496343

497-
# py38-integration-parity-ipc:
498-
# <<: *parity_steps
499-
# docker:
500-
# - image: circleci/python:3.8
501-
# environment:
502-
# TOXENV: py38-integration-parity-ipc
503-
# PARITY_VERSION: v2.3.5
504-
# PARITY_OS: linux
505-
506-
# py38-integration-parity-http:
507-
# <<: *parity_steps
508-
# docker:
509-
# - image: circleci/python:3.8
510-
# environment:
511-
# TOXENV: py38-integration-parity-http
512-
# PARITY_VERSION: v2.3.5
513-
# PARITY_OS: linux
514-
515-
# py38-integration-parity-ws:
516-
# <<: *parity_steps
517-
# docker:
518-
# - image: circleci/python:3.8
519-
# environment:
520-
# TOXENV: py38-integration-parity-ws
521-
# PARITY_VERSION: v2.3.5
522-
# PARITY_OS: linux
523-
524344
py38-integration-ethtester-pyevm:
525345
<<: *common
526346
docker:
@@ -586,33 +406,6 @@ jobs:
586406
TOXENV: py39-integration-goethereum-ws
587407
GETH_VERSION: v1.10.13
588408

589-
# py39-integration-parity-ipc:
590-
# <<: *parity_steps
591-
# docker:
592-
# - image: circleci/python:3.9
593-
# environment:
594-
# TOXENV: py39-integration-parity-ipc
595-
# PARITY_VERSION: v2.3.5
596-
# PARITY_OS: linux
597-
598-
# py39-integration-parity-http:
599-
# <<: *parity_steps
600-
# docker:
601-
# - image: circleci/python:3.9
602-
# environment:
603-
# TOXENV: py39-integration-parity-http
604-
# PARITY_VERSION: v2.3.5
605-
# PARITY_OS: linux
606-
607-
# py39-integration-parity-ws:
608-
# <<: *parity_steps
609-
# docker:
610-
# - image: circleci/python:3.9
611-
# environment:
612-
# TOXENV: py39-integration-parity-ws
613-
# PARITY_VERSION: v2.3.5
614-
# PARITY_OS: linux
615-
616409
py39-integration-ethtester-pyevm:
617410
<<: *common
618411
docker:
@@ -641,31 +434,17 @@ workflows:
641434
test:
642435
jobs:
643436
# These are the longest running tests, start them first
644-
- py36-core
645437
- py37-core
646438
- py38-core
647439
- py39-core
648440
- lint
649441
- docs
650442
- benchmark
651-
- py36-ens
652-
- py36-ethpm
653-
- py36-integration-goethereum-ipc
654-
- py36-integration-goethereum-http
655-
- py36-integration-goethereum-ws
656-
# - py36-integration-parity-ipc
657-
# - py36-integration-parity-http
658-
# - py36-integration-parity-ws
659-
- py36-integration-ethtester-pyevm
660-
- py36-wheel-cli
661443
- py37-ens
662444
- py37-ethpm
663445
- py37-integration-goethereum-ipc
664446
- py37-integration-goethereum-http
665447
- py37-integration-goethereum-ws
666-
# - py37-integration-parity-ipc
667-
# - py37-integration-parity-http
668-
# - py37-integration-parity-ws
669448
- py37-integration-ethtester-pyevm
670449
- py37-wheel-cli
671450
- py37-wheel-cli-windows
@@ -674,18 +453,12 @@ workflows:
674453
- py38-integration-goethereum-ipc
675454
- py38-integration-goethereum-http
676455
- py38-integration-goethereum-ws
677-
# - py38-integration-parity-ipc
678-
# - py38-integration-parity-http
679-
# - py38-integration-parity-ws
680456
- py38-integration-ethtester-pyevm
681457
- py38-wheel-cli
682458
- py39-ens
683459
- py39-ethpm
684460
- py39-integration-goethereum-ipc
685461
- py39-integration-goethereum-http
686462
- py39-integration-goethereum-ws
687-
# - py39-integration-parity-ipc
688-
# - py39-integration-parity-http
689-
# - py39-integration-parity-ws
690463
- py39-integration-ethtester-pyevm
691464
- py39-wheel-cli

‎newsfragments/2343.breaking-change.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Remove support for the unsupported Python 3.6
2+
Also removes outdated Parity tests

‎setup.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"typing-extensions>=3.7.4.1,<5;python_version<'3.8'",
9393
"websockets>=9.1,<10",
9494
],
95-
python_requires='>=3.6,<4',
95+
python_requires='>=3.7,<3.10',
9696
extras_require=extras_require,
9797
py_modules=['web3', 'ens', 'ethpm'],
9898
entry_points={"pytest11": ["pytest_ethereum = web3.tools.pytest_ethereum.plugins"]},
@@ -107,7 +107,6 @@
107107
'License :: OSI Approved :: MIT License',
108108
'Natural Language :: English',
109109
'Programming Language :: Python :: 3',
110-
'Programming Language :: Python :: 3.6',
111110
'Programming Language :: Python :: 3.7',
112111
'Programming Language :: Python :: 3.8',
113112
'Programming Language :: Python :: 3.9',

‎tox.ini‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[tox]
22
envlist=
3-
py{36,37,38,39}-ens
4-
py{36,37,38,39}-ethpm
5-
py{36,37,38,39}-core
6-
py{36,37,38,39}-integration-{goethereum,ethtester}
3+
py{37,38,39}-ens
4+
py{37,38,39}-ethpm
5+
py{37,38,39}-core
6+
py{37,38,39}-integration-{goethereum,ethtester}
77
lint
88
docs
99
benchmark
10-
py{36,37,38,39}-wheel-cli
10+
py{37,38,39}-wheel-cli
1111

1212
[isort]
1313
combine_as_imports=True
@@ -48,8 +48,7 @@ passenv =
4848
WEB3_INFURA_PROJECT_ID
4949
WEB3_INFURA_API_SECRET
5050
basepython =
51-
docs: python3.6
52-
py36: python3.6
51+
docs: python3.9
5352
py37: python3.7
5453
py38: python3.8
5554
py39: python3.9
@@ -80,12 +79,6 @@ commands=
8079
/bin/bash -c 'pip install --upgrade "$(ls dist/web3-*-py3-none-any.whl)" --progress-bar off'
8180
python -c "from web3.auto import w3"
8281

83-
[testenv:py36-wheel-cli]
84-
deps={[common-wheel-cli]deps}
85-
whitelist_externals={[common-wheel-cli]whitelist_externals}
86-
commands={[common-wheel-cli]commands}
87-
skip_install=true
88-
8982
[testenv:py37-wheel-cli]
9083
deps={[common-wheel-cli]deps}
9184
whitelist_externals={[common-wheel-cli]whitelist_externals}

0 commit comments

Comments
 (0)