From 75a5d674999e1e4427530f7d6308e643e350e46b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20G=C3=B6ransson?= Date: Mon, 11 Aug 2025 10:18:41 +0200 Subject: [PATCH 1/2] pin pyyaml version that is compatible with grizzly --- pyproject.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index bb8746d..f8b118d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "chardet ==5.2.0", "tomli ==2.0.1", "pyotp ==2.9.0", - "PyYAML ==6.0.1", + "PyYAML ==6.0.2", "progress ==1.6", "jinja2-simple-tags ==0.6.1", "azure-core ==1.30.1", @@ -70,9 +70,8 @@ dev = [ "requests-mock ==1.12.1", "pip-licenses ==4.3.4", "pytablewriter ==1.2.0", - "PyYAML ==6.0.1", "line-profiler ==4.1.2", - "gevent ==24.2.1", + "gevent>=24.10.1,<26.0.0", "flask ==3.0.3", "types-requests >=2.27.13,<3.0.0", "setuptools-scm==8.1.0", From 51f35424d2f090b6ca41c36c834aeb4782cf6f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikael=20G=C3=B6ransson?= Date: Mon, 11 Aug 2025 10:45:07 +0200 Subject: [PATCH 2/2] update pinned azure-* versions to match with grizzly. update grizzly dist container image to use python 3.13.3, to get rid of threading exceptions in gevent. use python 3.13 in devcontainer. --- .devcontainer/Dockerfile | 2 +- .devcontainer/devcontainer.json | 2 +- grizzly_cli/static/Containerfile | 2 +- pyproject.toml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 46b0de8..fb1b276 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,7 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.209.6/containers/python-3/.devcontainer/base.Dockerfile # [Choice] Python version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.10, 3.9, 3.8, 3.7, 3.6, 3-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3.7-bullseye, 3.6-bullseye, 3-buster, 3.10-buster, 3.9-buster, 3.8-buster, 3.7-buster, 3.6-buster -ARG VARIANT="3.12" +ARG VARIANT="3.13" FROM alpine:latest AS dependencies USER root diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ff9d604..502e13e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,7 +9,7 @@ // Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6 // Append -bullseye or -buster to pin to an OS version. // Use -bullseye variants on local on arm64/Apple Silicon. - "VARIANT": "3.12", + "VARIANT": "3.13", // Options "NODE_VERSION": "none" } diff --git a/grizzly_cli/static/Containerfile b/grizzly_cli/static/Containerfile index 8f63471..80e132a 100644 --- a/grizzly_cli/static/Containerfile +++ b/grizzly_cli/static/Containerfile @@ -1,7 +1,7 @@ ARG GRIZZLY_EXTRA=base ARG GRIZZLY_INSTALL_TYPE=remote -FROM python:3.12-slim AS base +FROM python:3.13.3-slim AS base ENV DEBIAN_FRONTEND=noninteractive diff --git a/pyproject.toml b/pyproject.toml index f8b118d..7f6c042 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,9 +22,9 @@ dependencies = [ "PyYAML ==6.0.2", "progress ==1.6", "jinja2-simple-tags ==0.6.1", - "azure-core ==1.30.1", - "azure-keyvault-secrets ==4.8.0", - "azure-identity ==1.17.1" + "azure-core ==1.34.0", + "azure-keyvault-secrets ==4.10.0", + "azure-identity ==1.23.1" ] classifiers = [ "Development Status :: 5 - Production/Stable",