diff options
| author | Zuul <zuul@review.openstack.org> | 2019-01-22 19:07:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-01-22 19:07:49 +0000 |
| commit | 8c60cc113599e479a23b9428b9fe51b951776468 (patch) | |
| tree | 8f6a51b0753da6316348d6e88e2e7f1fff001c0b | |
| parent | 7d36be9982a34d92985df36c21c4e3878fc04c3c (diff) | |
| parent | 0d75776ae5c0fb78863b7c93b54c58b5600da93d (diff) | |
| download | oslo-db-8c60cc113599e479a23b9428b9fe51b951776468.tar.gz | |
Merge "Update hacking version"
| -rw-r--r-- | oslo_db/sqlalchemy/update_match.py | 4 | ||||
| -rw-r--r-- | 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 543101e..8e139e9 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 0f5306d..98fdbe8 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 |