diff options
author | Cesar Francisco San Nicolas Martinez <csannico@redhat.com> | 2024-03-14 13:32:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-14 13:32:56 +0100 |
commit | 393d9c39c6e0354700feabba66091860ad500c75 (patch) | |
tree | c8f06e032a214653f2c111e62f2f5a7f9a157617 | |
parent | Skip replicas test for awx-operator (#14987) (diff) | |
download | awx-393d9c39c6e0354700feabba66091860ad500c75.tar.xz awx-393d9c39c6e0354700feabba66091860ad500c75.zip |
Mismatch dependencies version (#14986)
* Fixed mismatch between setuptools version in the makefile and requirements file
* Fix mismatch of versions in makefile and requirements
* Added maturin license
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | licenses/maturin.txt | 25 | ||||
-rw-r--r-- | requirements/requirements.in | 2 | ||||
-rw-r--r-- | requirements/requirements.txt | 19 |
4 files changed, 41 insertions, 7 deletions
@@ -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 diff --git a/licenses/maturin.txt b/licenses/maturin.txt new file mode 100644 index 0000000000..3f075704a7 --- /dev/null +++ b/licenses/maturin.txt @@ -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.
\ No newline at end of file diff --git a/requirements/requirements.in b/requirements/requirements.in index 059f817430..706f659d3a 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -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 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index bb2a7be0fd..bbef9556d6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -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 |