From fb5a1af6666a88a9d4dc6d0ee887d85937a19137 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 10 Jan 2025 13:16:04 +0000 Subject: [PATCH] bump min required Python version to 3.10 --- .cirrus.yml | 18 ++++++++---------- README.md | 2 +- contrib/freeze_packages.sh | 2 +- run_electrum | 2 +- setup.py | 2 +- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index b53ee7039..103c4cb00 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -10,8 +10,6 @@ task: TOXENV: py3 ELECTRUM_PYTHON_NAME: python3 matrix: - - env: - ELECTRUM_PYTHON_VERSION: 3.9 - env: ELECTRUM_PYTHON_VERSION: 3.10 - env: @@ -85,11 +83,11 @@ task: locale_script: - contrib/push_locale env: - ELECTRUM_IMAGE: python:3.9 + ELECTRUM_IMAGE: python:3.10 ELECTRUM_REQUIREMENTS_CI: contrib/requirements/requirements-ci.txt # in addition, crowdin_api_key is set as an "override" in https://cirrus-ci.com/settings/... depends_on: - - "unittests: Tox Python 3.9" + - "unittests: Tox Python 3.10" only_if: $CIRRUS_BRANCH == 'master' task: @@ -156,7 +154,7 @@ task: flake8_script: - flake8 . --count --select="$ELECTRUM_LINTERS" --ignore="$ELECTRUM_LINTERS_IGNORE" --show-source --statistics --exclude "*_pb2.py,electrum/_vendor/" env: - ELECTRUM_IMAGE: python:3.9 + ELECTRUM_IMAGE: python:3.10 ELECTRUM_REQUIREMENTS: contrib/requirements/requirements.txt matrix: - name: "linter: Flake8 Mandatory" @@ -212,7 +210,7 @@ task: CIRRUS_WORKING_DIR: /opt/wine64/drive_c/electrum CIRRUS_DOCKER_CONTEXT: contrib/build-wine depends_on: - - "unittests: Tox Python 3.9" + - "unittests: Tox Python 3.10" task: name: "build: Android (QML $APK_ARCH)" @@ -246,7 +244,7 @@ task: binaries_artifacts: path: "dist/*" depends_on: - - "unittests: Tox Python 3.9" + - "unittests: Tox Python 3.10" ## mac build disabled, as Cirrus CI no longer supports Intel-based mac builds #task: @@ -309,7 +307,7 @@ task: env: CIRRUS_DOCKER_CONTEXT: contrib/build-linux/appimage depends_on: - - "unittests: Tox Python 3.9" + - "unittests: Tox Python 3.10" task: container: @@ -332,12 +330,12 @@ task: env: OMIT_UNCLEAN_FILES: 1 depends_on: - - "unittests: Tox Python 3.9" + - "unittests: Tox Python 3.10" task: name: "check submodules" container: - image: python:3.9 + image: python:3.10 cpu: 1 memory: 1G fetch_script: diff --git a/README.md b/README.md index f8142e6ca..afc7c889f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ``` Licence: MIT Licence Author: Thomas Voegtlin -Language: Python (>= 3.8) +Language: Python (>= 3.10) Homepage: https://electrum.org/ ``` diff --git a/contrib/freeze_packages.sh b/contrib/freeze_packages.sh index c0eeda6e8..e29572018 100755 --- a/contrib/freeze_packages.sh +++ b/contrib/freeze_packages.sh @@ -8,7 +8,7 @@ contrib=$(dirname "$0") # note: we should not use a higher version of python than what the binaries bundle if [[ ! "$SYSTEM_PYTHON" ]] ; then - SYSTEM_PYTHON=$(which python3.8) || printf "" + SYSTEM_PYTHON=$(which python3.10) || printf "" else SYSTEM_PYTHON=$(which $SYSTEM_PYTHON) || printf "" fi diff --git a/run_electrum b/run_electrum index cc582f2c0..439e71b9c 100755 --- a/run_electrum +++ b/run_electrum @@ -27,7 +27,7 @@ import os import sys -MIN_PYTHON_VERSION = "3.8.0" # FIXME duplicated from setup.py +MIN_PYTHON_VERSION = "3.10.0" # FIXME duplicated from setup.py _min_python_version_tuple = tuple(map(int, (MIN_PYTHON_VERSION.split(".")))) diff --git a/setup.py b/setup.py index ddf604286..a004490f6 100755 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ import subprocess from setuptools import setup, find_packages from setuptools.command.install import install -MIN_PYTHON_VERSION = "3.8.0" +MIN_PYTHON_VERSION = "3.10.0" _min_python_version_tuple = tuple(map(int, (MIN_PYTHON_VERSION.split("."))))