openstack
/
oslo.db
Code Issues Proposed changes

Merge "Update hacking version"

This commit is contained in:
Zuul 2019-01-22 19:07:49 +00:00 committed by Gerrit Code Review
parent 7d36be9982 0d75776ae5
commit 8c60cc1135
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oslo_db/sqlalchemy/update_match.py
View File

@ -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(

2
test-requirements.txt
View File

@ -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