[tor-commits] [sbws/maint-1.1] fix: CI: Update Python versions

[juga@xxxxxxxxxxxxxx]

commit 193f5da1b0024aefb03edee547d770f0584761f3
Author: juga0 <juga@xxxxxxxxxx>
Date:   Tue Mar 2 12:45:43 2021 +0000

    fix: CI: Update Python versions
    
    Closes #40055.
---
 .gitlab-ci.yml | 55 +++++++++++++++++++++++++++++++++++--------------------
 tox.ini        |  4 ++--
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10dfbc2..098781f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,16 @@
 # 0.4.6 stable by Jun 15, 2021
 # 0.4.5 (LTS) EOL Feb 15, 2023
 # 0.3.5 (LTS) EOL Feb 1, 2022
+# Python releases:
+# 3.10 stable by 2021-10-04: https://www.python.org/dev/peps/pep-0619/
+# Python stable releases: https://www.python.org/downloads/
+# 3.9 EOL 2025-10 PEP 596
+# 3.8 EOL 2024-10 PEP 569, newest major release
+# 3.7 EOL 2023-06-27 PEP 537, included in Debian buster
+# 3.6 EOL 2021-12-23 PEP 494
 
 variables:
-    BASE_IMAGE: python:3.7
+    BASE_IMAGE: python:3.8
     RELEASE: tor-nightly-master-buster
     # Without version, the default available in the Debian repository will be
     # installed.
@@ -38,47 +45,55 @@ before_script:
 after_script:
   - tox -e stats
 
-python36tor035:
+python36:
   variables:
     BASE_IMAGE: python:3.6
+  image: $BASE_IMAGE
+  script:
+  - tox -e py36
+  - tox -e integration
+
+python37tor035:
+  variables:
+    BASE_IMAGE: python:3.7
     RELEASE: tor-nightly-0.3.5.x-buster
     TOR: tor=0.3.5*
   image: $BASE_IMAGE
   script:
-    - tox -e py36
+    - tox -e py37
     - tox -e integration
 
-python36tor045:
+python37tor045:
   variables:
-    BASE_IMAGE: python:3.6
+    BASE_IMAGE: python:3.7
     RELEASE: tor-nightly-0.4.5.x-buster
     TOR: tor=0.4.5*
   image: $BASE_IMAGE
   script:
-  - tox -e py36
+  - tox -e py37
   - tox -e integration
 
-python36tormaster:
+python37tormaster:
   variables:
-    BASE_IMAGE: python:3.6
+    BASE_IMAGE: python:3.7
     RELEASE: tor-nightly-master-buster
     TOR: tor=0.4.6*
   image: $BASE_IMAGE
   script:
-  - tox -e py36
+  - tox -e py37
   - tox -e integration
 
-python36torstable:
+python37torstable:
   variables:
-    BASE_IMAGE: python:3.6
+    BASE_IMAGE: python:3.7
     RELEASE: buster
     TOR: tor
   image: $BASE_IMAGE
   script:
-  - tox -e py36
+  - tox -e py37
   - tox -e integration
 
-python37:
+python38:
   # This will overwrite the default before_script, so need to repeat the
   # commands
   before_script:
@@ -100,24 +115,24 @@ python37:
   script:
   - tox -e inst
   - tox -e setup
-  - tox -e py37
+  - tox -e py38
   - tox -e integration
   - tox -e lint
   - tox -e doc
 
-python38:
+python39:
   variables:
-    BASE_IMAGE: python:3.8
+    BASE_IMAGE: python:3.9
   image: $BASE_IMAGE
   script:
-  - tox -e py38
+  - tox -e py39
   - tox -e integration
 
-python39:
+python310:
   variables:
-    BASE_IMAGE: python:3.9-rc-buster
+    BASE_IMAGE: python:3.10-rc-buster
   image: $BASE_IMAGE
   script:
-  - tox -e py39
+  - tox -e py310
   - tox -e integration
   allow_failure: true
diff --git a/tox.ini b/tox.ini
index acd31aa..bb66836 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
 skip_missing_interpreters = True
-envlist = py{36, 37, 38, 39}, inst, setup, integration, lint, stats, doc
+envlist = py{36, 37, 38, 39, 310}, inst, setup, integration, lint, stats, doc
 
 [travis]
 python =
     3.6: py36, inst, setup, unit, integration, lint, doc
     3.7: py37, inst, setup, unit, integration, lint, doc
     3.8: py38, inst, setup, unit, integration, lint, doc
-    3.9-dev: py39, inst, setup, unit, integration, lint, doc
+    3.9: py39, inst, setup, unit, integration, lint, doc
     nightly: pynightly, inst, setup, unit, integration, lint, doc
 
 ; [testenv]



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits