External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-29 07:14:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Mismatch dependencies version (#14986)

Browse Source 
* Fixed mismatch between setuptools version in the makefile and requirements file

* Fix mismatch of versions in makefile and requirements

* Added maturin license
This commit is contained in:
Cesar Francisco San Nicolas Martinez 2024-03-14 13:32:56 +01:00 committed by GitHub
parent dfab342bb4
commit 393d9c39c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -63,7 +63,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==65.6.3 setuptools_scm[toml]==8.0.4 wheel==0.38.4
VENV_BOOTSTRAP ?= pip==21.2.4 setuptools==69.0.2 setuptools_scm[toml]==8.0.4 wheel==0.42.0
NAME ?= awx

25
licenses/maturin.txt Normal file
View File

@ -0,0 +1,25 @@
Copyright (c) 2018 konstin
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

2
requirements/requirements.in
View File

@ -34,6 +34,8 @@ jinja2>=3.1.3 # CVE-2024-22195
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
msrestazure
openshift
pexpect==4.7.0 # see library notes

19
requirements/requirements.txt
View File

@ -265,6 +265,8 @@ markdown==3.5.2
# via -r /awx_devel/requirements/requirements.in
markupsafe==2.1.5
# via jinja2
maturin==1.5.0
# via -r /awx_devel/requirements/requirements.in
more-itertools==10.2.0
# via
# irc
@ -276,8 +278,10 @@ msal==1.26.0
# msal-extensions
msal-extensions==1.1.0
# via azure-identity
msgpack==1.0.7
# via channels-redis
msgpack==1.0.5
# via
# -r /awx_devel/requirements/requirements.in
# channels-redis
msrest==0.7.1
# via msrestazure
msrestazure==0.6.4
@ -333,10 +337,12 @@ pyasn1-modules==0.3.0
# service-identity
pycparser==2.21
# via cffi
pydantic==2.6.1
pydantic==2.5.0
# via inflect
pydantic-core==2.16.2
# via pydantic
pydantic-core==2.14.1
# via
# -r /awx_devel/requirements/requirements.in
# pydantic
pygerduty==0.38.3
# via -r /awx_devel/requirements/requirements.in
pyjwt[crypto]==2.8.0
@ -473,6 +479,7 @@ tempora==5.5.1
# jaraco-logging
tomli==2.0.1
# via
# maturin
# setuptools-rust
# setuptools-scm
twilio==8.13.0
@ -522,7 +529,7 @@ zope-interface==6.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==69.1.0
setuptools==69.0.2
# via
# -r /awx_devel/requirements/requirements.in
# asciichartpy