diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55a3b538cf0009f6bec4d5a60ab8921287fecbe5_LmdpdGxhYi1jaS55bWw=..f0cb155c5776297b15c094e9951a8752614cffc5_LmdpdGxhYi1jaS55bWw= 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ # First, test with the latest and greatest Mercurial, across the # versions Python supported. We generally assume that if e.g. CPython -# 3.5 and 3.8 work, anything in between will work as well. +# 3.6 and 3.9 work, anything in between will work as well. Latest: extends: .base stage: current @@ -31,7 +31,7 @@ matrix: - &latest-versions PYTHON: - - "3.5" + - "3.6" - "3.9" HG: - "5.8" @@ -250,8 +250,5 @@ - wheelhouse parallel: matrix: - - PLATFORM: manylinux2010_x86_64 - ABI: - - cp27 - PLATFORM: manylinux2014_x86_64 ABI: @@ -256,6 +253,5 @@ - PLATFORM: manylinux2014_x86_64 ABI: - - cp35 - cp36 - cp37 - cp38 @@ -269,7 +265,6 @@ matrix: - PLATFORM: manylinux2014_aarch64 ABI: - - cp35 - cp36 - cp37 - cp38 diff --git a/contrib/docker/installhg.sh b/contrib/docker/installhg.sh index 55a3b538cf0009f6bec4d5a60ab8921287fecbe5_Y29udHJpYi9kb2NrZXIvaW5zdGFsbGhnLnNo..f0cb155c5776297b15c094e9951a8752614cffc5_Y29udHJpYi9kb2NrZXIvaW5zdGFsbGhnLnNo 100755 --- a/contrib/docker/installhg.sh +++ b/contrib/docker/installhg.sh @@ -12,12 +12,7 @@ PIPDEPENDS="https://www.mercurial-scm.org/repo/hg/archive/$HG.tar.gz" fi -PIPDEPENDS="$PIPDEPENDS dulwich pyflakes" - -if test "$PYTHON" -gt 3.5 -then - PIPDEPENDS="$PIPDEPENDS black==20.8b1" -fi +PIPDEPENDS="$PIPDEPENDS dulwich pyflakes black==20.8b1" set -xe