From 0d75776ae5c0fb78863b7c93b54c58b5600da93d Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Fri, 28 Dec 2018 22:52:08 +0800 Subject: [PATCH] Update hacking version update the hacking to latest, due to [1] [1]: https://github.com/openstack/oslo.db/blob/master/HACKING.rst Change-Id: I04147f3cbcb9c89a9a1afc1bcb299be8bdf06718 --- oslo_db/sqlalchemy/update_match.py | 4 ++-- test-requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/oslo_db/sqlalchemy/update_match.py b/oslo_db/sqlalchemy/update_match.py index 543101ef..8e139e96 100644 --- a/oslo_db/sqlalchemy/update_match.py +++ b/oslo_db/sqlalchemy/update_match.py @@ -292,8 +292,8 @@ def manufacture_entity_criteria(entity, include_only=None, exclude=None): existing = dict( (attr.key, attr.loaded_value) for attr in state.attrs - if attr.loaded_value is not orm.attributes.NO_VALUE - and attr.key not in exclude + if attr.loaded_value is not orm.attributes.NO_VALUE and + attr.key not in exclude ) if include_only: existing = dict( diff --git a/test-requirements.txt b/test-requirements.txt index 0f5306d0..98fdbe80 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,7 +1,7 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 +hacking>=1.1.0,<1.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT fixtures>=3.0.0 # Apache-2.0/BSD