Merge pull request #60 from stackhpc/upstream/yoga-2023-10-23

priteau · web-flow · commit b106bb321c05 · 2023-10-23T12:09:15.000+02:00
Synchronise yoga with upstream
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -120,7 +120,6 @@
 - project:
     queue: cloudkitty
     templates:
-      - openstack-lower-constraints-jobs
       - check-requirements
       - openstack-cover-jobs
       - openstack-python3-yoga-jobs
diff --git a/cloudkitty/api/v2/scope/state.py b/cloudkitty/api/v2/scope/state.py
@@ -225,7 +225,7 @@ def patch(self, scope_id, scope_key=None, fetcher=None,
             'scope_key': update_storage_scope.scope_key,
             'fetcher': update_storage_scope.fetcher,
             'collector': update_storage_scope.collector,
-            'state': update_storage_scope.state.isoformat(),
+            'state': update_storage_scope.last_processed_timestamp.isoformat(),
             'active': update_storage_scope.active,
             'scope_activation_toggle_date':
                 update_storage_scope.scope_activation_toggle_date.isoformat()
diff --git a/lower-constraints.txt b/lower-constraints.txt
diff --git a/releasenotes/notes/fix-update-scope-ee6224374073e467.yaml b/releasenotes/notes/fix-update-scope-ee6224374073e467.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fix patch scope API which was returning ``Internal Server Error``.
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,11 @@
+# Requirements lower bounds listed here are our best effort to keep them up to
+# date but we do not test them so no guarantee of having them all correct. If
+# you find any incorrect lower bounds, let us know or propose a fix.
+
 # 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.
+
 pbr>=5.5.1 # Apache-2.0
 alembic>=1.4.3 # MIT
 keystonemiddleware>=9.1.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
@@ -97,9 +97,3 @@ paths = ./cloudkitty/hacking
 [testenv:releasenotes]
 deps = {[testenv:docs]deps}
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html
-
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +fixes:
 +  - |
 +    Fix patch scope API which was returning ``Internal Server Error``.