ansible-test - Remove cap on cryptography version.

pull/76980/head
Matt Clay 2 years ago
parent e27b94c467
commit 00a2b7788e

@ -1,2 +1,2 @@
bugfixes: minor_changes:
- ansible-test - When installing ``cryptography < 3.4`` also install ``pyopenssl < 22`` to avoid conflicts. - ansible-test - Installation of ``cryptography`` is no longer version constrained when ``openssl`` 1.1.0 or later is installed.

@ -452,11 +452,11 @@ def get_cryptography_requirements(python): # type: (PythonConfig) -> t.List[str
# pyopenssl 20.0.0 requires cryptography 3.2 or later # pyopenssl 20.0.0 requires cryptography 3.2 or later
pyopenssl = 'pyopenssl < 20.0.0' pyopenssl = 'pyopenssl < 20.0.0'
else: else:
# cryptography 3.4+ fails to install on many systems # cryptography 3.4+ builds require a working rust toolchain
# this is a temporary work-around until a more permanent solution is available # systems bootstrapped using ansible-core-ci can access additional wheels through the spare-tire package index
cryptography = 'cryptography < 3.4' cryptography = 'cryptography'
# pyopenssl 20.0.0 requires cryptography 35 or later # any future installation of pyopenssl is free to use any compatible version of cryptography
pyopenssl = 'pyopenssl < 22.0.0' pyopenssl = ''
requirements = [ requirements = [
cryptography, cryptography,

@ -145,6 +145,13 @@ bootstrap_remote_freebsd()
sed -i '' 's/^# *PermitRootLogin.*$/PermitRootLogin yes/;' /etc/ssh/sshd_config sed -i '' 's/^# *PermitRootLogin.*$/PermitRootLogin yes/;' /etc/ssh/sshd_config
service sshd restart service sshd restart
fi fi
# make additional wheels available for packages which lack them for this platform
echo "# generated by ansible-test
[global]
extra-index-url = https://spare-tire.testing.ansible.com/simple/
prefer-binary = yes
" > /etc/pip.conf
} }
bootstrap_remote_macos() bootstrap_remote_macos()

Loading…
Cancel
Save