From 2e1abdd2f1d8585e3108033e0b475880fd58302e Mon Sep 17 00:00:00 2001 From: kevgliss Date: Wed, 29 Jul 2015 21:54:29 -0700 Subject: [PATCH] Fixing tests and pinning versions --- lemur/tests/test_certificates.py | 10 ++++----- setup.py | 38 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lemur/tests/test_certificates.py b/lemur/tests/test_certificates.py index 9e573ec6..48ee911e 100644 --- a/lemur/tests/test_certificates.py +++ b/lemur/tests/test_certificates.py @@ -27,7 +27,7 @@ def test_create_basic_csr(): country=u'US', state=u'CA', location=u'A place', - extensions=dict(subAltNames=[u'test.example.com', u'test2.example.com']) + extensions=dict(names=dict(subAltNames=[u'test.example.com', u'test2.example.com'])) ) csr, pem = create_csr(csr_config) @@ -56,15 +56,15 @@ def test_cert_is_san(): from lemur.tests.certs import INTERNAL_VALID_SAN_CERT, INTERNAL_VALID_LONG_CERT from lemur.certificates.models import cert_is_san - assert cert_is_san(INTERNAL_VALID_LONG_CERT) == None - assert cert_is_san(INTERNAL_VALID_SAN_CERT) == True + assert cert_is_san(INTERNAL_VALID_LONG_CERT) == None # noqa + assert cert_is_san(INTERNAL_VALID_SAN_CERT) == True # noqa def test_cert_is_wildcard(): from lemur.tests.certs import INTERNAL_VALID_WILDCARD_CERT, INTERNAL_VALID_LONG_CERT from lemur.certificates.models import cert_is_wildcard - assert cert_is_wildcard(INTERNAL_VALID_WILDCARD_CERT) == True - assert cert_is_wildcard(INTERNAL_VALID_LONG_CERT) == None + assert cert_is_wildcard(INTERNAL_VALID_WILDCARD_CERT) == True # noqa + assert cert_is_wildcard(INTERNAL_VALID_LONG_CERT) == None # noqa def test_cert_get_bitstrength(): diff --git a/setup.py b/setup.py index d8c5c600..1f3210c9 100644 --- a/setup.py +++ b/setup.py @@ -22,27 +22,27 @@ from subprocess import check_output ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__))) install_requires = [ - 'Flask>=0.10.1', - 'Flask-RESTful>=0.3.3', - 'Flask-SQLAlchemy>=1.0.5', - 'Flask-Script>=2.0.5', - 'Flask-Migrate>=1.4.0', - 'Flask-Bcrypt>=0.6.2', - 'Flask-Principal>=0.4.0', + 'Flask==0.10.1', + 'Flask-RESTful==0.3.3', + 'Flask-SQLAlchemy==1.0.5', + 'Flask-Script==2.0.5', + 'Flask-Migrate==1.4.0', + 'Flask-Bcrypt==0.6.2', + 'Flask-Principal==0.4.0', 'Flask-Mail==0.9.1', - 'SQLAlchemy-Utils>=0.30.11', + 'SQLAlchemy-Utils==0.30.11', 'BeautifulSoup4', - 'requests>=2.7.0', - 'psycopg2>=2.6.1', - 'arrow>=0.5.4', - 'boto>=2.38.0', # we might make this optional - 'six>=1.9.0', - 'gunicorn>=19.3.0', - 'pycrypto>=2.6.1', - 'cryptography>=1.0dev', - 'pyopenssl>=0.15.1', - 'pyjwt>=1.0.1', - 'xmltodict>=0.9.2' + 'requests==2.7.0', + 'psycopg2==2.6.1', + 'arrow==0.5.4', + 'boto==2.38.0', # we might make this optional + 'six==1.9.0', + 'gunicorn==19.3.0', + 'pycrypto==2.6.1', + 'cryptography==1.0dev', + 'pyopenssl==0.15.1', + 'pyjwt==1.0.1', + 'xmltodict==0.9.2' ] tests_require = [