Skip to content
Snippets Groups Projects
Commit 90067fe2 authored by Anton Shestakov's avatar Anton Shestakov
Browse files

ci: default to python3

parent 453302ef
No related branches found
No related tags found
1 merge request!42210.5.0: stable and default
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
script: script:
- *prepare_hg - *prepare_hg
- pytype --version - 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 - pytype -P /ci/repos/mercurial/:hgext3rd -k hgext3rd -x hgext3rd/evolve/thirdparty -j $jobs || true
when: manual when: manual
variables: variables:
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
- pytype -P /ci/repos/mercurial/:hgext3rd -k hgext3rd -x hgext3rd/evolve/thirdparty -j $jobs || true - pytype -P /ci/repos/mercurial/:hgext3rd -k hgext3rd -x hgext3rd/evolve/thirdparty -j $jobs || true
when: manual when: manual
variables: variables:
PY: py2 PY: py3
PYTHON: python PYTHON: python3
RUNTEST_ARGS: "" RUNTEST_ARGS: ""
TEST_HGMODULEPOLICY: "allow" TEST_HGMODULEPOLICY: "allow"
...@@ -33,8 +33,10 @@ ...@@ -33,8 +33,10 @@
checks-py2: checks-py2:
<<: *runtests <<: *runtests
variables: variables:
PY: py2
PYTHON: python2
RUNTEST_ARGS: "--test-list /tmp/check-tests.txt" RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
checks-py3: checks-py3:
<<: *runtests <<: *runtests
variables: variables:
...@@ -36,12 +38,10 @@ ...@@ -36,12 +38,10 @@
RUNTEST_ARGS: "--test-list /tmp/check-tests.txt" RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
checks-py3: checks-py3:
<<: *runtests <<: *runtests
variables: variables:
PY: py3
PYTHON: python3
RUNTEST_ARGS: "--test-list /tmp/check-tests.txt" RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
tests-py2-cext: tests-py2-cext:
<<: *runtests <<: *runtests
variables: variables:
...@@ -43,11 +43,13 @@ ...@@ -43,11 +43,13 @@
RUNTEST_ARGS: "--test-list /tmp/check-tests.txt" RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
tests-py2-cext: tests-py2-cext:
<<: *runtests <<: *runtests
variables: variables:
PY: py2
PYTHON: python2
RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
tests-py2-pure: tests-py2-pure:
<<: *runtests <<: *runtests
variables: variables:
...@@ -48,12 +50,14 @@ ...@@ -48,12 +50,14 @@
RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
tests-py2-pure: tests-py2-pure:
<<: *runtests <<: *runtests
variables: variables:
PY: py2
PYTHON: python2
RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "py" TEST_HGMODULEPOLICY: "py"
tests-py3-cext: tests-py3-cext:
<<: *runtests <<: *runtests
variables: variables:
...@@ -54,14 +58,12 @@ ...@@ -54,14 +58,12 @@
RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "py" TEST_HGMODULEPOLICY: "py"
tests-py3-cext: tests-py3-cext:
<<: *runtests <<: *runtests
variables: variables:
PY: py3
PYTHON: python3
RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
tests-py3-pure: tests-py3-pure:
<<: *runtests <<: *runtests
variables: variables:
...@@ -62,11 +64,9 @@ ...@@ -62,11 +64,9 @@
RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
tests-py3-pure: tests-py3-pure:
<<: *runtests <<: *runtests
variables: variables:
PY: py3
PYTHON: python3
RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "py" TEST_HGMODULEPOLICY: "py"
...@@ -76,5 +76,4 @@ ...@@ -76,5 +76,4 @@
- make doc - make doc
variables: variables:
LANG: en_US.UTF-8 LANG: en_US.UTF-8
PYTHON: python3
PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH" PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH"
...@@ -80,5 +79,4 @@ ...@@ -80,5 +79,4 @@
PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH" PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH"
SPHINXBUILD: python3 -m sphinx -b html
artifacts: artifacts:
paths: paths:
- html/* - html/*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment