Merge branch 'master' into hacluster-scaleback

2021-02-10 11:23:45 +01:00
parent 2c9459bf1f 2ef404be75
commit b245fea27f
2 changed files with 11 additions and 1 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -44,3 +44,8 @@ paramiko
 sphinx
 sphinxcontrib-asyncio
 git+https://github.com/openstack-charmers/zaza#egg=zaza
+
+# Newer versions require a Rust compiler to build, see
+# * https://github.com/openstack-charmers/zaza/issues/421
+# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
+cryptography<3.4
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,12 @@ install_require = [
    'futurist<2.0.0',
    'async_generator',
    'boto3',
-    'cryptography',
+
+    # Newer versions require a Rust compiler to build, see
+    # * https://github.com/openstack-charmers/zaza/issues/421
+    # * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
+    'cryptography<3.4',
+
    'dnspython',
    'hvac<0.7.0',
    'jinja2',