Skip to content

Commit

Permalink
Drop Python 3.7
Browse files Browse the repository at this point in the history
Even debians default version is now higher, so it's safe to drop this.
Also there are the first issues popping up with 3.7, like
typing_extensions problems.
  • Loading branch information
palango committed Dec 17, 2021
1 parent f89d6c5 commit 8d5c9fe
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 42 deletions.
58 changes: 29 additions & 29 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ templates:
parameter-templates: &parameter-templates
py-version: &py-version-template
description: "python version to be used in the executor"
default: "3.7"
default: "3.9"
type: enum
enum: ["3.7", "3.8", "3.9"]
enum: ["3.8", "3.9"]
resource: &resource-type-template
description: "resource type for underlying VM"
default: "medium"
Expand Down Expand Up @@ -498,7 +498,7 @@ jobs:
finalize:
executor:
name: docker
py-version: "3.7"
py-version: "3.9"
steps:
- run:
command: "true"
Expand All @@ -523,7 +523,7 @@ jobs:

executor:
name: docker
py-version: "3.7"
py-version: "3.9"
resource: << parameters.resource >>

steps:
Expand Down Expand Up @@ -572,7 +572,7 @@ jobs:

executor:
name: macos
py-version: "3.7"
py-version: "3.9"

steps:
- attach-and-link:
Expand Down Expand Up @@ -608,7 +608,7 @@ jobs:

executor:
name: docker
py-version: "3.7"
py-version: "3.9"

steps:
- add_ssh_keys:
Expand Down Expand Up @@ -657,7 +657,7 @@ jobs:

executor:
name: docker
py-version: "3.7"
py-version: "3.9"

steps:
- attach-and-link:
Expand Down Expand Up @@ -699,7 +699,7 @@ jobs:

executor:
name: docker
py-version: "3.7"
py-version: "3.9"

steps:
- attach-and-link:
Expand Down Expand Up @@ -733,7 +733,7 @@ workflows:
- prepare-python-linux:
matrix:
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
requires:
- prepare-system-linux

Expand All @@ -745,21 +745,21 @@ workflows:
- lint:
matrix:
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
requires:
- prepare-python-linux-<< matrix.py-version >>

- build-docs:
matrix:
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
requires:
- prepare-python-linux-<< matrix.py-version >>

- smoketest:
matrix:
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
transport-layer: ["matrix"]
environment-type: ["production", "development"]
blockchain-type: ["geth", "parity"]
Expand All @@ -770,7 +770,7 @@ workflows:
matrix:
alias: test
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
test-type: ["unit", "mocked"]
requires:
- lint-<< matrix.py-version >>
Expand All @@ -779,7 +779,7 @@ workflows:
matrix:
alias: test-fuzz
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
test-type: ["fuzz"]
additional-args: "--hypothesis-show-statistics"
requires:
Expand All @@ -796,7 +796,7 @@ workflows:

- scenario-player-integration-test:
name: scenario-player-integration-test
py-version: "3.7"
py-version: "3.9"
requires:
- smoketest
- test
Expand All @@ -807,7 +807,7 @@ workflows:
matrix:
alias: test-integration
parameters:
py-version: ["3.7"]
py-version: ["3.9"]
test-type: ["integration"]
blockchain-type: ["geth", "parity"]
resource: "medium+"
Expand Down Expand Up @@ -844,14 +844,14 @@ workflows:
<<: *only-tagged-version-filter

- prepare-python-linux:
py-version: '3.7'
py-version: '3.9'
requires:
- prepare-system-linux
filters:
<<: *only-tagged-version-filter

- prepare-python-macos:
py-version: '3.7'
py-version: '3.9'
requires:
- prepare-system-macos
filters:
Expand Down Expand Up @@ -911,7 +911,7 @@ workflows:
- prepare-python-linux:
matrix:
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
requires:
- prepare-system-linux

Expand All @@ -923,21 +923,21 @@ workflows:
- lint:
matrix:
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
requires:
- prepare-python-linux-<< matrix.py-version >>

- build-docs:
matrix:
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
requires:
- prepare-python-linux-<< matrix.py-version >>

- smoketest:
matrix:
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
transport-layer: ["matrix"]
environment-type: ["production", "development"]
blockchain-type: ["geth", "parity"]
Expand All @@ -948,7 +948,7 @@ workflows:
matrix:
alias: test
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
test-type: ["unit", "mocked"]
requires:
- lint-<< matrix.py-version >>
Expand All @@ -957,7 +957,7 @@ workflows:
matrix:
alias: test-fuzz
parameters:
py-version: ["3.7", "3.8", "3.9"]
py-version: ["3.8", "3.9"]
test-type: ["fuzz"]
additional-args: "--hypothesis-show-statistics"
requires:
Expand All @@ -974,7 +974,7 @@ workflows:

- scenario-player-integration-test:
name: scenario-player-integration-test
py-version: "3.7"
py-version: "3.9"
requires:
- smoketest
- test
Expand All @@ -985,7 +985,7 @@ workflows:
matrix:
alias: test-integration
parameters:
py-version: ["3.7"]
py-version: ["3.9"]
test-type: ["integration"]
blockchain-type: ["geth", "parity"]
resource: "medium+"
Expand Down Expand Up @@ -1013,15 +1013,15 @@ workflows:
- checkout

- prepare-python-macos:
name: prepare-python-macos-3.7
py-version: '3.7'
name: prepare-python-macos-3.9
py-version: '3.9'
requires:
- prepare-system-macos

- build-binary-macos:
requires:
- finalize
- prepare-python-macos-3.7
- prepare-python-macos-3.9

- deploy-digitalocean:
context: "raiden-py"
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# virtualenvs on first run. See tools/pre-commit/pre-commit-wrapper.py for details.

default_language_version:
python: python3.7
python: python3.9

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ See [nix.rst](docs/nix.rst).

These are the required external dependencies for development:

- Python >=3.7.
- Python >=3.8.
- Ethereum client (Geth recommended).
- Solidity compiler >=0.4.23.
- A matrix capable server (Synapse recommended).
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ GITHUB_ACCESS_TOKEN_ARG=--build-arg GITHUB_ACCESS_TOKEN_FRAGMENT=$(GITHUB_ACCESS
endif

# architecture needs to be asked in docker because docker can be run on remote host to create binary for different architectures
bundle-docker: ARCHITECTURE_TAG = $(shell docker run --rm python:3.7 uname -m)
bundle-docker: ARCHITECTURE_TAG = $(shell docker run --rm python:3.9 uname -m)
bundle-docker: ARCHIVE_TAG ?= v$(shell python setup.py --version)
bundle-docker:
docker build -t pyinstallerbuilder --build-arg ARCHITECTURE_TAG=$(ARCHITECTURE_TAG) --build-arg ARCHIVE_TAG=$(ARCHIVE_TAG) $(GITHUB_ACCESS_TOKEN_ARG) -f docker/build.Dockerfile .
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#### Quicklinks

[![Python 3.7](https://img.shields.io/pypi/pyversions/raiden.svg)](https://raiden-network.readthedocs.io/en/stable/) [![Chat on Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/raiden-network/raiden?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
[![Python 3.9](https://img.shields.io/pypi/pyversions/raiden.svg)](https://raiden-network.readthedocs.io/en/stable/) [![Chat on Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/raiden-network/raiden?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

- [Getting Started](#getting-started)
- [Repositories](#repositories)
Expand Down
2 changes: 1 addition & 1 deletion docker/build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.7-stretch
FROM python:3.9-stretch

# install dependencies
RUN apt-get update
Expand Down
6 changes: 3 additions & 3 deletions docs/custom-setups/private_net_tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ If ``mkdir`` fails, choose a different name, or move the existing ``priv_chain``
.. code:: bash
$ cd priv_chain
$ virtualenv -p python3.7 env
$ virtualenv -p python3.9 env
$ source env/bin/activate
You should now be in the virtual environment, where all Python package installations are separately managed.
Expand Down Expand Up @@ -129,8 +129,8 @@ Figure out the value ``CONTRACTS_VERSION``
.. code:: bash
(env) $ cd raiden
(env) $ grep 'CONTRACTS_VERSION = ' -r ../env/lib/python3.7/site-packages/raiden_contracts
../env/lib/python3.7/site-packages/raiden_contracts/constants.py:CONTRACTS_VERSION = "0.37.0"
(env) $ grep 'CONTRACTS_VERSION = ' -r ../env/lib/python3.9/site-packages/raiden_contracts
../env/lib/python3.9/site-packages/raiden_contracts/constants.py:CONTRACTS_VERSION = "0.37.0"
Copy the shown version somewhere.

Expand Down
4 changes: 2 additions & 2 deletions docs/macos_install_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ The following instructions will guide you from a clean installation of macOS to

$ sudo pip install virtualenv

#. Create a virtualenv for raiden (requires python3.7)::
#. Create a virtualenv for raiden (requires python3.8)::

$ virtualenv --python=python3.7 venv-raiden
$ virtualenv --python=python3.8 venv-raiden

#. "Activate" the virtualenv::

Expand Down
2 changes: 1 addition & 1 deletion docs/overview_and_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ Navigate to the directory::

cd raiden

It's strongly advised to create a virtualenv_ for Raiden (requires python3.7) and install all python dependencies there.
It's strongly advised to create a virtualenv_ for Raiden (requires python3.8) and install all python dependencies there.

After you have done that you can proceed to install the dependencies::

Expand Down
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ def read_requirements(path: str) -> List[str]:
"License :: OSI Approved :: MIT License",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
Expand All @@ -103,6 +102,6 @@ def read_requirements(path: str) -> List[str]:
setup_requires=["setuptools_scm"],
install_requires=read_requirements("requirements/requirements.txt"),
tests_require=test_requirements,
python_requires=">=3.7",
python_requires=">=3.8",
entry_points={"console_scripts": ["raiden = raiden.__main__:main"]},
)

0 comments on commit 8d5c9fe

Please sign in to comment.