summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2021-04-15 01:32:40 +0200
committerMike Frysinger <vapier@google.com>2021-06-03 11:34:17 +0000
commita3b2edf1af4854881c763010d1083e8c76ac7535 (patch)
tree0a42ec1a817f733567a4b3d8a4ce533a1380fc30
parente253b43e17de114f1efafa9a3e3929f23115ae99 (diff)
downloadgit-repo-a3b2edf1af4854881c763010d1083e8c76ac7535.tar.gz
Drop support for Python 3.5
Running repo with Python 3.5 fails due to the use of the encoding parameter to subprocess.run(). There are also f-strings being used in some of the tests. This drops support for these systems: * Ubuntu Xenial: released Apr 2016, EOS Apr 2021, EOL Apr 2024 * Debian Stretch: released Jun 2017, EOL Jun 2022 So the minimum required distros now are: * Ubuntu Bionic: released Apr 2018 w/Python 3.6 * Debian Buster: released Jul 2019 w/Python 3.7 Change-Id: I1144f7ab6f882b10cac0131982df081fe4ac44f9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/303363 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
-rw-r--r--.github/workflows/test-ci.yml2
-rwxr-xr-xmain.py2
-rw-r--r--requirements.json4
-rwxr-xr-xsetup.py2
-rw-r--r--tox.ini3
5 files changed, 6 insertions, 7 deletions
diff --git a/.github/workflows/test-ci.yml b/.github/workflows/test-ci.yml
index ec6f3791..19881858 100644
--- a/.github/workflows/test-ci.yml
+++ b/.github/workflows/test-ci.yml
@@ -14,7 +14,7 @@ jobs:
14 fail-fast: false 14 fail-fast: false
15 matrix: 15 matrix:
16 os: [ubuntu-latest, macos-latest, windows-latest] 16 os: [ubuntu-latest, macos-latest, windows-latest]
17 python-version: [3.5, 3.6, 3.7, 3.8, 3.9] 17 python-version: [3.6, 3.7, 3.8, 3.9]
18 runs-on: ${{ matrix.os }} 18 runs-on: ${{ matrix.os }}
19 19
20 steps: 20 steps:
diff --git a/main.py b/main.py
index e399ddce..1f3a7683 100755
--- a/main.py
+++ b/main.py
@@ -71,7 +71,7 @@ from subcmds import all_commands
71# 71#
72# python-3.6 is in Ubuntu Bionic. 72# python-3.6 is in Ubuntu Bionic.
73MIN_PYTHON_VERSION_SOFT = (3, 6) 73MIN_PYTHON_VERSION_SOFT = (3, 6)
74MIN_PYTHON_VERSION_HARD = (3, 5) 74MIN_PYTHON_VERSION_HARD = (3, 6)
75 75
76if sys.version_info.major < 3: 76if sys.version_info.major < 3:
77 print('repo: error: Python 2 is no longer supported; ' 77 print('repo: error: Python 2 is no longer supported; '
diff --git a/requirements.json b/requirements.json
index 86b9a46c..cb55cd25 100644
--- a/requirements.json
+++ b/requirements.json
@@ -38,9 +38,9 @@
38 # Supported Python versions. 38 # Supported Python versions.
39 # 39 #
40 # python-3.6 is in Ubuntu Bionic. 40 # python-3.6 is in Ubuntu Bionic.
41 # python-3.5 is in Debian Stretch. 41 # python-3.7 is in Debian Buster.
42 "python": { 42 "python": {
43 "hard": [3, 5], 43 "hard": [3, 6],
44 "soft": [3, 6] 44 "soft": [3, 6]
45 }, 45 },
46 46
diff --git a/setup.py b/setup.py
index 9d0ff5f9..17aeae22 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,6 @@ setuptools.setup(
56 'Programming Language :: Python :: 3 :: Only', 56 'Programming Language :: Python :: 3 :: Only',
57 'Topic :: Software Development :: Version Control :: Git', 57 'Topic :: Software Development :: Version Control :: Git',
58 ], 58 ],
59 python_requires='>=3.5', 59 python_requires='>=3.6',
60 packages=['subcmds'], 60 packages=['subcmds'],
61) 61)
diff --git a/tox.ini b/tox.ini
index 3282de14..aa4e2979 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,11 +15,10 @@
15# https://tox.readthedocs.io/ 15# https://tox.readthedocs.io/
16 16
17[tox] 17[tox]
18envlist = py35, py36, py37, py38, py39 18envlist = py36, py37, py38, py39
19 19
20[gh-actions] 20[gh-actions]
21python = 21python =
22 3.5: py35
23 3.6: py36 22 3.6: py36
24 3.7: py37 23 3.7: py37
25 3.8: py38 24 3.8: py38