Browse Source

Merge "Update hacking version"

Zuul 3 months ago
parent
commit
8c60cc1135
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      oslo_db/sqlalchemy/update_match.py
  2. 1
    1
      test-requirements.txt

+ 2
- 2
oslo_db/sqlalchemy/update_match.py View File

@@ -292,8 +292,8 @@ def manufacture_entity_criteria(entity, include_only=None, exclude=None):
292 292
     existing = dict(
293 293
         (attr.key, attr.loaded_value)
294 294
         for attr in state.attrs
295
-        if attr.loaded_value is not orm.attributes.NO_VALUE
296
-        and attr.key not in exclude
295
+        if attr.loaded_value is not orm.attributes.NO_VALUE and
296
+        attr.key not in exclude
297 297
     )
298 298
     if include_only:
299 299
         existing = dict(

+ 1
- 1
test-requirements.txt View File

@@ -1,7 +1,7 @@
1 1
 # The order of packages is significant, because pip processes them in the order
2 2
 # of appearance. Changing the order has an impact on the overall integration
3 3
 # process, which may cause wedges in the gate later.
4
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
4
+hacking>=1.1.0,<1.2.0 # Apache-2.0
5 5
 coverage!=4.4,>=4.0 # Apache-2.0
6 6
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
7 7
 fixtures>=3.0.0 # Apache-2.0/BSD

Loading…
Cancel
Save