# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1575294271 -3600
# Node ID 777a352d2ade0af8e83ba224c40e35f9f0b87f77
# Parent  7dbc0cf62a0b5f94fb3cdab8b12d32fef0010f0f# Parent  3cd5e9b1d0398afdbc730ff6cd48a9bee45f9e81
test-compat: merge mercurial-4.7 into mercurial-4.6

diff -r 7dbc0cf62a0b -r 777a352d2ade .gitlab-ci.yml
--- a/.gitlab-ci.yml	Thu Nov 28 10:54:04 2019 +0100
+++ b/.gitlab-ci.yml	Mon Dec 02 14:44:31 2019 +0100
@@ -18,19 +18,3 @@
         - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
         - hg -R /ci/repos/mercurial/ update "$hg_rev"
         - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always --pure)
-
-tests-py3-cext:
-    image: octobus/ci-py3-hgext3rd
-    script:
-        - hg pull -R /ci/repos/mercurial/
-        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
-        - hg -R /ci/repos/mercurial/ update "$hg_rev"
-        - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always)
-
-tests-py3-pure:
-    image: octobus/ci-py3-hgext3rd
-    script:
-        - hg pull -R /ci/repos/mercurial/
-        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
-        - hg -R /ci/repos/mercurial/ update "$hg_rev"
-        - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always --pure)