From 04c5d5cb28419d71e1e84ed40d997d2a384a5dcc Mon Sep 17 00:00:00 2001 From: Satoe Imaishi Date: Tue, 7 Jan 2025 18:34:14 -0500 Subject: [PATCH 1/2] Update dependencies to fix offline build --- Makefile | 2 +- requirements/README.md | 2 ++ requirements/requirements.in | 2 +- requirements/requirements.txt | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0010d7aaae2b..ac18ab11d1b0 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ RECEPTOR_IMAGE ?= quay.io/ansible/receptor:devel SRC_ONLY_PKGS ?= cffi,pycparser,psycopg,twilio # These should be upgraded in the AWX and Ansible venv before attempting # to install the actual requirements -VENV_BOOTSTRAP ?= pip==21.2.4 setuptools==69.0.2 setuptools_scm[toml]==8.0.4 wheel==0.42.0 cython==0.29.37 +VENV_BOOTSTRAP ?= pip==21.2.4 setuptools==72.1.0 setuptools_scm[toml]==8.1.0 wheel==0.45.1 cython==3.0.11 NAME ?= awx diff --git a/requirements/README.md b/requirements/README.md index 4978d0bf4058..141973be694d 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -62,6 +62,8 @@ If modifying these libraries make sure testing with the offline build is perform Versions need to match the versions used in the pip bootstrapping step in the top-level Makefile. +Verify ansible-runner's build dependency doesn't conflict with the changes made. + ### cryptography If modifying this library make sure testing with the offline build is performed to confirm it is functionally working. diff --git a/requirements/requirements.in b/requirements/requirements.in index 1d4de337aea4..eb0d2ef95a58 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -33,7 +33,7 @@ JSON-log-formatter jsonschema Markdown # used for formatting API help maturin # pydantic-core build dep -msgpack<1.0.6 # 1.0.6+ requires cython>=3 +msgpack msrestazure openshift opentelemetry-api~=1.24 # new y streams can be drastically different, in a good way diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 36220721ad11..70e99b319c08 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -268,7 +268,7 @@ msal==1.31.1 # msal-extensions msal-extensions==1.2.0 # via azure-identity -msgpack==1.0.5 +msgpack==1.1.0 # via # -r /awx_devel/requirements/requirements.in # channels-redis @@ -522,7 +522,7 @@ zope-interface==7.2 # The following packages are considered to be unsafe in a requirements file: pip==21.2.4 # via -r /awx_devel/requirements/requirements.in -setuptools==75.6.0 +setuptools==72.1.0 # via # -r /awx_devel/requirements/requirements.in # asciichartpy From 69c7bcff7e07d1a19a9ebf213ba9c0bc33891efd Mon Sep 17 00:00:00 2001 From: Satoe Imaishi Date: Wed, 8 Jan 2025 11:42:57 -0500 Subject: [PATCH 2/2] Downgrade cryptography due to compatibility issue with openssl --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 70e99b319c08..c52a4f66563b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -92,7 +92,7 @@ click==8.1.7 # via receptorctl constantly==23.10.4 # via twisted -cryptography==44.0.0 +cryptography==41.0.7 # via # -r /awx_devel/requirements/requirements.in # adal