bump min required Python version to 3.10
This commit is contained in:
+8
-10
@@ -10,8 +10,6 @@ task:
|
|||||||
TOXENV: py3
|
TOXENV: py3
|
||||||
ELECTRUM_PYTHON_NAME: python3
|
ELECTRUM_PYTHON_NAME: python3
|
||||||
matrix:
|
matrix:
|
||||||
- env:
|
|
||||||
ELECTRUM_PYTHON_VERSION: 3.9
|
|
||||||
- env:
|
- env:
|
||||||
ELECTRUM_PYTHON_VERSION: 3.10
|
ELECTRUM_PYTHON_VERSION: 3.10
|
||||||
- env:
|
- env:
|
||||||
@@ -85,11 +83,11 @@ task:
|
|||||||
locale_script:
|
locale_script:
|
||||||
- contrib/push_locale
|
- contrib/push_locale
|
||||||
env:
|
env:
|
||||||
ELECTRUM_IMAGE: python:3.9
|
ELECTRUM_IMAGE: python:3.10
|
||||||
ELECTRUM_REQUIREMENTS_CI: contrib/requirements/requirements-ci.txt
|
ELECTRUM_REQUIREMENTS_CI: contrib/requirements/requirements-ci.txt
|
||||||
# in addition, crowdin_api_key is set as an "override" in https://cirrus-ci.com/settings/...
|
# in addition, crowdin_api_key is set as an "override" in https://cirrus-ci.com/settings/...
|
||||||
depends_on:
|
depends_on:
|
||||||
- "unittests: Tox Python 3.9"
|
- "unittests: Tox Python 3.10"
|
||||||
only_if: $CIRRUS_BRANCH == 'master'
|
only_if: $CIRRUS_BRANCH == 'master'
|
||||||
|
|
||||||
task:
|
task:
|
||||||
@@ -156,7 +154,7 @@ task:
|
|||||||
flake8_script:
|
flake8_script:
|
||||||
- flake8 . --count --select="$ELECTRUM_LINTERS" --ignore="$ELECTRUM_LINTERS_IGNORE" --show-source --statistics --exclude "*_pb2.py,electrum/_vendor/"
|
- flake8 . --count --select="$ELECTRUM_LINTERS" --ignore="$ELECTRUM_LINTERS_IGNORE" --show-source --statistics --exclude "*_pb2.py,electrum/_vendor/"
|
||||||
env:
|
env:
|
||||||
ELECTRUM_IMAGE: python:3.9
|
ELECTRUM_IMAGE: python:3.10
|
||||||
ELECTRUM_REQUIREMENTS: contrib/requirements/requirements.txt
|
ELECTRUM_REQUIREMENTS: contrib/requirements/requirements.txt
|
||||||
matrix:
|
matrix:
|
||||||
- name: "linter: Flake8 Mandatory"
|
- name: "linter: Flake8 Mandatory"
|
||||||
@@ -212,7 +210,7 @@ task:
|
|||||||
CIRRUS_WORKING_DIR: /opt/wine64/drive_c/electrum
|
CIRRUS_WORKING_DIR: /opt/wine64/drive_c/electrum
|
||||||
CIRRUS_DOCKER_CONTEXT: contrib/build-wine
|
CIRRUS_DOCKER_CONTEXT: contrib/build-wine
|
||||||
depends_on:
|
depends_on:
|
||||||
- "unittests: Tox Python 3.9"
|
- "unittests: Tox Python 3.10"
|
||||||
|
|
||||||
task:
|
task:
|
||||||
name: "build: Android (QML $APK_ARCH)"
|
name: "build: Android (QML $APK_ARCH)"
|
||||||
@@ -246,7 +244,7 @@ task:
|
|||||||
binaries_artifacts:
|
binaries_artifacts:
|
||||||
path: "dist/*"
|
path: "dist/*"
|
||||||
depends_on:
|
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
|
## mac build disabled, as Cirrus CI no longer supports Intel-based mac builds
|
||||||
#task:
|
#task:
|
||||||
@@ -309,7 +307,7 @@ task:
|
|||||||
env:
|
env:
|
||||||
CIRRUS_DOCKER_CONTEXT: contrib/build-linux/appimage
|
CIRRUS_DOCKER_CONTEXT: contrib/build-linux/appimage
|
||||||
depends_on:
|
depends_on:
|
||||||
- "unittests: Tox Python 3.9"
|
- "unittests: Tox Python 3.10"
|
||||||
|
|
||||||
task:
|
task:
|
||||||
container:
|
container:
|
||||||
@@ -332,12 +330,12 @@ task:
|
|||||||
env:
|
env:
|
||||||
OMIT_UNCLEAN_FILES: 1
|
OMIT_UNCLEAN_FILES: 1
|
||||||
depends_on:
|
depends_on:
|
||||||
- "unittests: Tox Python 3.9"
|
- "unittests: Tox Python 3.10"
|
||||||
|
|
||||||
task:
|
task:
|
||||||
name: "check submodules"
|
name: "check submodules"
|
||||||
container:
|
container:
|
||||||
image: python:3.9
|
image: python:3.10
|
||||||
cpu: 1
|
cpu: 1
|
||||||
memory: 1G
|
memory: 1G
|
||||||
fetch_script:
|
fetch_script:
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
```
|
```
|
||||||
Licence: MIT Licence
|
Licence: MIT Licence
|
||||||
Author: Thomas Voegtlin
|
Author: Thomas Voegtlin
|
||||||
Language: Python (>= 3.8)
|
Language: Python (>= 3.10)
|
||||||
Homepage: https://electrum.org/
|
Homepage: https://electrum.org/
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ contrib=$(dirname "$0")
|
|||||||
|
|
||||||
# note: we should not use a higher version of python than what the binaries bundle
|
# note: we should not use a higher version of python than what the binaries bundle
|
||||||
if [[ ! "$SYSTEM_PYTHON" ]] ; then
|
if [[ ! "$SYSTEM_PYTHON" ]] ; then
|
||||||
SYSTEM_PYTHON=$(which python3.8) || printf ""
|
SYSTEM_PYTHON=$(which python3.10) || printf ""
|
||||||
else
|
else
|
||||||
SYSTEM_PYTHON=$(which $SYSTEM_PYTHON) || printf ""
|
SYSTEM_PYTHON=$(which $SYSTEM_PYTHON) || printf ""
|
||||||
fi
|
fi
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ import os
|
|||||||
import sys
|
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("."))))
|
_min_python_version_tuple = tuple(map(int, (MIN_PYTHON_VERSION.split("."))))
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import subprocess
|
|||||||
from setuptools import setup, find_packages
|
from setuptools import setup, find_packages
|
||||||
from setuptools.command.install import install
|
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("."))))
|
_min_python_version_tuple = tuple(map(int, (MIN_PYTHON_VERSION.split("."))))
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user