From 15b05be87baf7671aea3747f5f20640068b1557a Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Tue, 2 Aug 2016 10:56:32 +0200
Subject: [PATCH] Fix pep8 and py27 tests in Ubuntu Xenial

With the introduction of Ubuntu Xenial images, we are having issues
with pep8 and py27 tests, see
http://logs.openstack.org/78/330478/6/check/gate-packstack-pep8-ubuntu-xenial/1011cfa/console.html
for an example.

Since the cryptography version constraint was set to allow Nova to
work, I'm setting the same constraint here (!=1.3.0,>=1.0), which
seems to work as expected.

Change-Id: I2783bf9a7f32e11fdf661b18b2937d3420c6aa2d
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9cef063da..6eb83c8ea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 netaddr>=0.7.6
 PyYAML>=3.10
 docutils>=0.11
-cryptography!=1.2.2,>=1.0
+cryptography!=1.3.0,>=1.0
 pyOpenSSL<15.0.0
diff --git a/setup.py b/setup.py
index 08b713a46..46dfffb50 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(
     long_description=read('README.md'),
     zip_safe=False,
     install_requires=['netaddr>=0.7.6', 'pyOpenSSL<15.0.0', 'PyYAML>=3.10',
-                      'docutils>=0.11', 'cryptography<=1.2.2,>=1.0'],
+                      'docutils>=0.11', 'cryptography!=1.3.0,>=1.0'],
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Topic :: Utilities",