Airflow stable 2.6.2

This PS updates python modules and code to match Airflow 2.6.2

Change-Id: If6f57325339995216d2553c7a5ff56e7673b5acc

armada/handlers/metrics.py

@@ -115,13 +115,14 @@ class ActionWithTimeoutMetrics(ActionMetrics):
 
         timeout.observe(timeout_value)
 
-        def observe_timeout_usage(duration):
-            # Avoid division by 0
-            if timeout_value:
-                val = duration / timeout_value
-                timeout_usage.observe(val)
+        class observe_timeout_usage:
+            def calculate_timeout_usage(duration):
+                # Avoid division by 0
+                if timeout_value:
+                    val = duration / timeout_value
+                    timeout_usage.observe(val)
 
-        timer = context_managers.Timer(observe_timeout_usage)
+        timer = context_managers.Timer(observe_timeout_usage, 'calculate_timeout_usage')
         context = super().get_context(*args, **kwargs)
         context.enter_context(timer)
         return context

armada/tests/unit/handlers/test_override.py

@@ -273,7 +273,7 @@ class OverrideTestCase(testtools.TestCase):
             ovr = Override(documents)
             ovr.update_documents(merging_values)
             ovr_doc = ovr.find_manifest_document(doc_path)
-            expect_doc = list(yaml.load_all(e.read()))[0]
+            expect_doc = list(yaml.safe_load_all(e.read()))[0]
 
             self.assertEqual(ovr_doc, expect_doc)
 
@@ -290,7 +290,7 @@ class OverrideTestCase(testtools.TestCase):
             ovr = Override(documents, override)
             ovr.update_manifests()
             ovr_doc = ovr.find_manifest_document(doc_path)
-            target_docs = list(yaml.load_all(e.read()))
+            target_docs = list(yaml.safe_load_all(e.read()))
             expected_doc = [
                 x for x in target_docs
                 if x.get('schema') == 'armada/Manifest/v1'

requirements-direct.txt

@@ -20,7 +20,7 @@ keystonemiddleware<=10.2.0
 oslo.utils<=4.12.3
 Paste>=2.0.3
 PasteDeploy>=1.5.2
-prometheus-client==0.8.0
+prometheus-client==0.17.0
 pylibyaml==0.1.0
 python-dateutil==2.8.1
 PyYAML<=5.4.1

requirements-frozen-bionic.txt

@@ -49,7 +49,7 @@ Paste==3.5.3
 PasteDeploy==2.1.1
 pbr==5.11.1
 pip==21.3.1
-prometheus-client==0.8.0
+prometheus-client==0.17.0
 py==1.11.0
 pyasn1==0.5.0
 pyasn1-modules==0.3.0

requirements-frozen-stable.txt

@@ -0,0 +1,64 @@
+attrs==23.1.0
+cachetools==5.3.1
+certifi==2023.5.7
+charset-normalizer==3.1.0
+click==8.1.3
+debtcollector==2.5.0
+decorator==5.1.1
+deepdiff==6.3.0
+falcon==3.1.1
+fixtures==4.1.0
+gitdb==4.0.10
+GitPython==3.1.31
+google-auth==2.20.0
+idna==3.4
+importlib-resources==5.12.0
+iso8601==2.0.0
+jsonschema==4.17.3
+keystoneauth1==5.2.1
+kubernetes==23.6.0
+msgpack==1.0.5
+netaddr==0.8.0
+netifaces==0.11.0
+oauthlib==3.2.2
+ordered-set==4.1.0
+os-service-types==1.7.0
+oslo.config==9.1.1
+oslo.context==5.1.1
+oslo.i18n==6.0.0
+oslo.log==5.2.0
+oslo.policy==4.2.0
+oslo.serialization==5.1.1
+oslo.utils==6.1.0
+packaging==21.3
+pbr==5.11.1
+pip==23.1.2
+pkgutil_resolve_name==1.3.10
+prometheus-client==0.17.0
+py==1.11.0
+pyasn1==0.4.8
+pyasn1-modules==0.2.8
+pylibyaml==0.1.0
+pyparsing==3.0.9
+pyrsistent==0.19.3
+python-dateutil==2.8.2
+pytz==2023.3
+PyYAML==6.0
+requests==2.31.0
+requests-oauthlib==1.3.1
+responses==0.23.1
+retry==0.9.2
+rfc3986==1.5.0
+rsa==4.9
+setuptools==67.7.2
+six==1.16.0
+smmap==5.0.0
+stevedore==5.1.0
+testtools==2.6.0
+types-PyYAML==6.0.12.10
+urllib3==1.26.16
+uWSGI==2.0.21
+websocket-client==1.5.3
+wheel==0.40.0
+wrapt==1.15.0
+zipp==3.15.0

requirements-frozen.txt

@@ -48,7 +48,7 @@ Paste==3.5.3
 PasteDeploy==3.0.1
 pbr==5.11.1
 pip==23.0.1
-prometheus-client==0.8.0
+prometheus-client==0.17.0
 py==1.11.0
 pyasn1==0.5.0
 pyasn1-modules==0.3.0

requirements-stable.txt

@@ -0,0 +1,23 @@
+click
+deepdiff
+falcon
+GitPython
+jsonschema
+keystoneauth1
+kubernetes
+oslo.config
+oslo.i18n
+oslo.log
+oslo.policy
+oslo.utils
+pbr
+prometheus-client
+pylibyaml
+python_dateutil
+PyYAML
+Requests
+responses
+retry
+testtools
+urllib3
+uwsgi

test-requirements.txt

@@ -1,5 +1,5 @@
 bandit==1.6.0
-cmd2>=1.5.0
+# cmd2>=1.5.0
 coverage==5.3
 flake8-import-order>=0.18.1
 flake8==3.8.4
@@ -7,14 +7,13 @@ grpcio-tools>=1.16.0
 mock==4.0.2
 os-testr>=1.0.0 # Apache-2.0
 pyflakes==2.2.0
-responses==0.12.1
+responses==0.23.1
 sphinx-rtd-theme==0.5.0
 stestr==3.2.0
 testrepository==0.0.20
 testresources==2.0.1
 testscenarios==0.5.0
-testtools==2.5.0
-testtools==2.5.0
-tox>=3.28.0, <4.0.0
-typing-extensions>=3.7.2
+# testtools==2.5.0
+# tox>=3.28.0, <4.0.0
+# typing-extensions>=3.7.2
 yapf==0.27.0

tox.ini

@@ -30,6 +30,19 @@ commands =
 commands =
   {posargs}
 
+[testenv:freeze-stable]
+basepython=python3
+recreate = True
+allowlist_externals=
+  rm
+  sh
+deps=
+  -r{toxinidir}/requirements-stable.txt
+  -c https://raw.githubusercontent.com/apache/airflow/constraints-2.6.2/constraints-3.8.txt
+commands=
+  rm -f requirements-frozen-stable.txt
+  sh -c "pip freeze --all | grep -vE 'armada|pyinotify|pkg-resources==0.0.0' > requirements-frozen-stable.txt"
+
 
 [testenv:freeze]
 basepython=python3
@@ -72,6 +85,16 @@ commands =
     stestr run {posargs}
     stestr slowest
 
+[testenv:py38-stable]
+deps=
+    -r{toxinidir}/requirements-frozen-stable.txt
+    -r{toxinidir}/test-requirements.txt
+commands =
+    {[testenv]commands}
+    stestr run {posargs}
+    stestr slowest
+
+
 [testenv:docs]
 deps=
     -r{toxinidir}/requirements-frozen.txt