diff .gitlab-ci.yml @ 6151:90067fe2df5d stable

ci: default to python3

--- a/.gitlab-ci.yml	Wed Feb 23 18:01:54 2022 +0300
+++ b/.gitlab-ci.yml	Sun Feb 20 13:35:47 2022 +0300
@@ -11,13 +11,13 @@
     script:
         - *prepare_hg
         - pytype --version
-        - jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()')
+        - jobs=$(python3 -c 'import multiprocessing; print(multiprocessing.cpu_count())')
         - pytype -P /ci/repos/mercurial/:hgext3rd -k hgext3rd -x hgext3rd/evolve/thirdparty -j $jobs || true
     when: manual
 
 variables:
-    PY: py2
-    PYTHON: python
+    PY: py3
+    PYTHON: python3
     RUNTEST_ARGS: ""
     TEST_HGMODULEPOLICY: "allow"
 
@@ -33,40 +33,40 @@
 checks-py2:
     <<: *runtests
     variables:
+        PY: py2
+        PYTHON: python2
         RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
 
 checks-py3:
     <<: *runtests
     variables:
-        PY: py3
-        PYTHON: python3
         RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
 
 tests-py2-cext:
     <<: *runtests
     variables:
+        PY: py2
+        PYTHON: python2
         RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"
 
 tests-py2-pure:
     <<: *runtests
     variables:
+        PY: py2
+        PYTHON: python2
         RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
 tests-py3-cext:
     <<: *runtests
     variables:
-        PY: py3
-        PYTHON: python3
         RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"
 
 tests-py3-pure:
     <<: *runtests
     variables:
-        PY: py3
-        PYTHON: python3
         RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
@@ -76,9 +76,7 @@
         - make doc
     variables:
         LANG: en_US.UTF-8
-        PYTHON: python3
         PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH"
-        SPHINXBUILD: python3 -m sphinx -b html
     artifacts:
         paths:
             - html/*