From 9a316ae1a9856bf78a52f14e209911ef54697b11 Mon Sep 17 00:00:00 2001 From: kevgliss Date: Mon, 23 Nov 2015 10:23:23 -0800 Subject: [PATCH 1/2] Updating requirements --- README.rst | 4 ++++ setup.py | 32 ++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/README.rst b/README.rst index 2d4a68ab..a42241f3 100644 --- a/README.rst +++ b/README.rst @@ -16,6 +16,10 @@ Lemur .. image:: https://travis-ci.org/Netflix/lemur.svg :target: https://travis-ci.org/Netflix/lemur +.. image:: https://requires.io/github/kevgliss/lemur/requirements.svg?branch=master + :target: https://requires.io/github/kevgliss/lemur/requirements/?branch=master + :alt: Requirements Status + .. image:: https://badge.waffle.io/Netflix/lemur.png?label=ready&title=Ready :target: https://waffle.io/Netflix/lemur :alt: 'Stories in Ready' diff --git a/setup.py b/setup.py index 82227946..9338f2e6 100644 --- a/setup.py +++ b/setup.py @@ -25,36 +25,36 @@ ROOT = os.path.realpath(os.path.join(os.path.dirname(__file__))) install_requires = [ 'Flask==0.10.1', - 'Flask-RESTful==0.3.3', - 'Flask-SQLAlchemy==2.0', + 'Flask-RESTful==0.3.4', + 'Flask-SQLAlchemy==2.1', 'Flask-Script==2.0.5', - 'Flask-Migrate==1.4.0', - 'Flask-Bcrypt==0.6.2', + 'Flask-Migrate==1.6.0', + 'Flask-Bcrypt==0.7.1', 'Flask-Principal==0.4.0', 'Flask-Mail==0.9.1', - 'SQLAlchemy-Utils==0.30.11', - 'BeautifulSoup4', - 'requests==2.7.0', + 'SQLAlchemy-Utils==0.31.3', + 'BeautifulSoup4==4.4.1', + 'requests==2.8.1', 'psycopg2==2.6.1', - 'arrow==0.5.4', + 'arrow==0.7.0', 'boto==2.38.0', # we might make this optional 'six==1.9.0', 'gunicorn==19.3.0', 'pycrypto==2.6.1', - 'cryptography==1.0.2', + 'cryptography==1.1.1', 'pyopenssl==0.15.1', - 'pyjwt==1.0.1', + 'pyjwt==1.4.0', 'xmltodict==0.9.2', - 'lockfile==0.10.2', - 'future==0.15.0', + 'lockfile==0.11.0', + 'future==0.15.2', ] tests_require = [ 'pyflakes', - 'moto==0.4.6', + 'moto==0.4.18', 'nose==1.3.7', - 'pytest==2.7.2', - 'pytest-flask==0.8.1' + 'pytest==2.8.3', + 'pytest-flask==0.10.0' ] docs_require = [ @@ -63,7 +63,7 @@ docs_require = [ ] dev_requires = [ - 'flake8>=2.0,<2.1', + 'flake8>=2.0,<2.5.0', ] From eb2fa74661f4d43d12b71eacb7633026e647dcfa Mon Sep 17 00:00:00 2001 From: kevgliss Date: Mon, 23 Nov 2015 14:49:05 -0800 Subject: [PATCH 2/2] Fixing test --- lemur/tests/test_roles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemur/tests/test_roles.py b/lemur/tests/test_roles.py index e14b6c61..cf737cf6 100644 --- a/lemur/tests/test_roles.py +++ b/lemur/tests/test_roles.py @@ -10,7 +10,7 @@ def test_crud(session): role = update(role.id, 'role_new', None, []) assert role.name == 'role_new' delete(role.id) - assert get(role.id) == None + assert not get(role.id) def test_role_get(client):