Release 2024-05-30

.github/workflows/build.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.10.6
+          python-version: 3.10.13
           cache: pip
       - name: Install Python requirements
         run: make install_requirements

.github/workflows/test.yml

@@ -67,7 +67,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.10.6
+        python-version: 3.10.13
         cache: pip
     - name: Install Python requirements
       run: make install_requirements

buildpack/infrastructure/database.py

@@ -503,6 +503,7 @@ def get_database_jdbc_url(self):
         url = self.credentials.get("url", "")
         pattern = r"jdbc:sap://(?P<host>[^:]+):(?P<port>[0-9]+)/?(?P<q>\?(?P<params>.*))?$"  # noqa:C0301
         match = re.search(pattern, url)
+        q = None
         if match is None:
             logging.error("Unable to parse Hana JDBC url string for parameters")
             raise Exception("Unable to parse Hana JDBC url string for parameters")

buildpack/stage.py

@@ -25,6 +25,7 @@
 )
 BUILD_DIR = os.path.abspath(sys.argv[1])
 CACHE_DIR = os.path.abspath(os.path.join(sys.argv[2], "bust"))
+DEPS_DIR = None
 DOT_LOCAL_LOCATION = os.path.abspath(os.path.join(BUILD_DIR, ".local"))
 if len(sys.argv) >= 5:
     DEPS_DIR = os.path.abspath(sys.argv[3])

dependencies-stage.yml

@@ -1,8 +1,8 @@
 ---
 - name: python
-  version: 3.10.6
-  uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.10.6_linux_x64_cflinuxfs4_62e69f06.tgz
-  sha256: 62e69f0664e0bbb05a6351d4d96dc9ea6b959c4c2e4ccdb124f932d0bdac0e41
+  version: 3.10.13
+  uri: https://buildpacks.cloudfoundry.org/dependencies/python/python_3.10.13_linux_x64_cflinuxfs4_04ab8c1b.tgz
+  sha256: 04ab8c1b6b0d1f8fd8a03d932bf8cc6744843ad12bb5e801784b7ff470aa7401
   cf_stacks:
   - cflinuxfs4
-  source_sha256: 848cb06a5caa85da5c45bd7a9221bb821e33fc2bdcba088c127c58fad44e6343
+  source_sha256: 698ec55234c1363bd813b460ed53b0f108877c7a133d48bde9a50a1eb57b7e65

dependencies.yml

@@ -3,9 +3,10 @@ dependencies:
   appdynamics:
     agent:
       artifact: appdynamics/appdynamics-agent-1.8-{{ version }}.zip
+      version: 24.4.1
     machine-agent:
       artifact: appdynamics/appdynamics-machineagent-bundle-{{ version }}.zip
-    version: 22.1.0
+      version: 24.4.0
   databroker:
     debezium:
       artifact: experimental/databroker/debezium-{{ version }}.tar.gz

lib/m2ee/profileutil.py

@@ -44,16 +44,17 @@ def __str__(self):
 
     def pretty_format(self, print_queries=True):
         if print_queries:
-            queries = "\n\n".join(
-                [
-                    "query: %s \nduration:%s" % (x["query"], x["duration"])
-                    for x in self.queries
-                ]
-            )
-        elif not print_queries:
-            queries = "Omitting, %s queries in total" % len(self.queries)
-        elif len(self.queries) == 0:
-            queries = " None"
+            if len(self.queries) > 0:
+                queries = "\n\n".join(
+                    [
+                        f"query: {x['query']} \nduration: {x['duration']}"
+                        for x in self.queries
+                    ]
+                )
+            else:
+                queries = " None"
+        else:
+            queries = f"Omitting, {len(self.queries)} queries in total"
 
         if hasattr(self, "user_roles"):
             userroles = ",".join(self.user_roles)  # pylint: disable=no-member

requirements-dev.in

@@ -1,11 +1,11 @@
 click==8.1.7
-idna==3.6
-pytest==8.0.1
+idna==3.7
+pytest==8.2.1
 pytest-timer==1.0.0
-pytest-timeout==2.2.0
-pylint==3.0.3
+pytest-timeout==2.3.1
+pylint==3.2.2
 pyopenssl==24.0.0
 randomname==0.2.1
-requests-mock==1.11.0
-ruff==0.2.2
+requests-mock==1.12.1
+ruff==0.4.5
 parameterized==0.9.0

requirements.in

@@ -1,6 +1,6 @@
 backoff==2.2.1
 certifi==2024.2.2
-cryptography==42.0.4
+cryptography==42.0.7
 distro==1.9.0
 httplib2==0.22.0
 jinja2==3.1.4

requirements.txt

@@ -16,13 +16,13 @@ cffi==1.14.4
     # via cryptography
 charset-normalizer==2.0.3
     # via requests
-cryptography==42.0.4
+cryptography==42.0.7
     # via -r requirements.in
 distro==1.9.0
     # via -r requirements.in
 httplib2==0.22.0
     # via -r requirements.in
-idna==2.8
+idna==3.7
     # via requests
 jinja2==3.1.4
     # via -r requirements.in