Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies to fix offline build #15732

Closed
wants to merge 2 commits into from
Closed

Update dependencies to fix offline build #15732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04c5d5c
Update dependencies to fix offline build
simaishi Jan 7, 2025
69c7bcf
Downgrade cryptography due to compatibility issue with openssl
simaishi Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cross-referencing, this makes the values match what's in requirements.txt, which is really our goof here. It would be good for us to add some form of check for this.


NAME ?= awx

Expand Down
2 changes: 2 additions & 0 deletions requirements/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading