Ver código fonte

Fix Python 3.5 old deps build by using a compatible pip version. (#9217)

Co-authored-by: Dan Callahan <danc@element.io>

pip 21.0 stopped supporting Python 3.5.
tags/v1.27.0rc1
Patrick Cloke 3 anos atrás
committed by Richard van der Hoff
pai
commit
2547d9d4d7
3 arquivos alterados com 11 adições e 8 exclusões
  1. +3
    -0
      .buildkite/scripts/test_old_deps.sh
  2. +1
    -0
      changelog.d/9217.misc
  3. +7
    -8
      tox.ini

+ 3
- 0
.buildkite/scripts/test_old_deps.sh Ver arquivo

@@ -10,4 +10,7 @@ apt-get install -y python3.5 python3.5-dev python3-pip libxml2-dev libxslt-dev x

export LANG="C.UTF-8"

# Prevent virtualenv from auto-updating pip to an incompatible version
export VIRTUALENV_NO_DOWNLOAD=1

exec tox -e py35-old,combine

+ 1
- 0
changelog.d/9217.misc Ver arquivo

@@ -0,0 +1 @@
Fix the Python 3.5 old dependencies build.

+ 7
- 8
tox.ini Ver arquivo

@@ -18,11 +18,13 @@ deps =
# installed on that).
#
# anyway, make sure that we have a recent enough setuptools.
setuptools>=18.5
setuptools>=18.5 ; python_version >= '3.6'
setuptools>=18.5,<51.0.0 ; python_version < '3.6'

# we also need a semi-recent version of pip, because old ones fail to
# install the "enum34" dependency of cryptography.
pip>=10
pip>=10 ; python_version >= '3.6'
pip>=10,<21.0 ; python_version < '3.6'

# directories/files we run the linters on
lint_targets =
@@ -103,15 +105,10 @@ usedevelop=true
[testenv:py35-old]
skip_install=True
deps =
# Ensure a version of setuptools that supports Python 3.5 is installed.
setuptools < 51.0.0

# Old automat version for Twisted
Automat == 0.3.0

lxml
coverage
coverage-enable-subprocess==1.0
{[base]deps}

commands =
# Make all greater-thans equals so we test the oldest version of our direct
@@ -168,6 +165,8 @@ commands = {toxinidir}/scripts-dev/generate_sample_config --check
skip_install = True
deps =
coverage
pip>=10 ; python_version >= '3.6'
pip>=10,<21.0 ; python_version < '3.6'
commands=
coverage combine
coverage report


Carregando…
Cancelar
Salvar