General lib upgrades

This commit is contained in:
John Westcott IV 2022-11-11 13:30:30 -05:00
parent 01c6ac1b14
commit a1edc75c11
3 changed files with 141 additions and 120 deletions

View File

@ -34,7 +34,7 @@ RECEPTOR_IMAGE ?= quay.io/ansible/receptor:devel
SRC_ONLY_PKGS ?= cffi,pycparser,psycopg2,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==58.2.0 setuptools_scm[toml]==6.4.2 wheel==0.36.2
VENV_BOOTSTRAP ?= pip==21.2.4 setuptools>=62.4.0 setuptools_scm[toml]==6.4.2 wheel==0.36.2
NAME ?= awx

View File

@ -6,7 +6,7 @@ autobahn>=20.12.3 # CVE-2020-35678
azure-keyvault==1.1.0 # see UPGRADE BLOCKERs
channels
channels-redis>=3.1.0 # https://github.com/django/channels_redis/issues/212
cryptography>=36.0.2,<37.0.0 # Until paramiko fixes https://github.com/paramiko/paramiko/issues/2038 we don't want to go to 37 or we end up with blowfish warnings in the job output
cryptography
Cython<3 # Since the bump to PyYAML 5.4.1 this is now a mandatory dep
daphne
distro
@ -61,7 +61,7 @@ uWSGI
uwsgitop
wheel
pip==21.2.4 # see UPGRADE BLOCKERs
setuptools==58.2.0 # see UPGRADE BLOCKERs
setuptools>=62.4.0 # see UPGRADE BLOCKERs
setuptools_scm[toml]>=3.4 # see UPGRADE BLOCKERs, xmlsec build dep
lxml>=3.8 # xmlsec build dep
pkgconfig>=1.5.1 # xmlsec build dep

View File

@ -1,15 +1,15 @@
adal==1.2.2
adal==1.2.7
# via msrestazure
aiohttp==3.7.4
aiohttp==3.8.3
# via -r /awx_devel/requirements/requirements.in
aioredis==1.3.1
# via channels-redis
aiosignal==1.3.1
# via aiohttp
# via -r /awx_devel/requirements/requirements_git.txt
ansiconv==1.0.0
# via -r /awx_devel/requirements/requirements.in
asciichartpy==1.5.25
# via -r /awx_devel/requirements/requirements.in
asgiref==3.5.0
asgiref==3.5.2
# via
# channels
# channels-redis
@ -17,53 +17,57 @@ asgiref==3.5.0
# django
asn1==2.6.0
# via -r /awx_devel/requirements/requirements.in
async-timeout==3.0.1
async-timeout==4.0.2
# via
# aiohttp
# aioredis
attrs==19.3.0
# redis
attrs==22.1.0
# via
# aiohttp
# automat
# jsonschema
# service-identity
# twisted
autobahn==20.12.3
autobahn==22.7.1
# via
# -r /awx_devel/requirements/requirements.in
# daphne
automat==20.2.0
autocommand==2.2.1
# via jaraco-text
automat==22.10.0
# via twisted
azure-common==1.1.25
azure-common==1.1.28
# via azure-keyvault
azure-core==1.26.1
# via msrest
azure-keyvault==1.1.0
# via -r /awx_devel/requirements/requirements.in
azure-nspkg==3.0.2
# via azure-keyvault
cachetools==4.0.0
cachetools==5.2.0
# via google-auth
# via
# -r /awx_devel/requirements/requirements_git.txt
# kubernetes
# msrest
# requests
cffi==1.14.0
cffi==1.15.1
# via cryptography
channels==2.4.0
channels==4.0.0
# via
# -r /awx_devel/requirements/requirements.in
# channels-redis
channels-redis==3.1.0
channels-redis==4.0.0
# via -r /awx_devel/requirements/requirements.in
chardet==3.0.4
# via aiohttp
charset-normalizer==2.0.7
# via requests
click==7.1.2
charset-normalizer==2.1.1
# via
# aiohttp
# requests
click==8.1.3
# via receptorctl
constantly==15.1.0
# via twisted
cryptography==36.0.2
cryptography==38.0.3
# via
# -r /awx_devel/requirements/requirements.in
# adal
@ -72,19 +76,21 @@ cryptography==36.0.2
# pyopenssl
# service-identity
# social-auth-core
cython==0.29.22
cython==0.29.32
# via -r /awx_devel/requirements/requirements.in
daphne==4.0.0
# via -r /awx_devel/requirements/requirements.in
daphne==2.4.1
# via
# -r /awx_devel/requirements/requirements.in
# channels
dataclasses==0.6
# via python-tss-sdk
defusedxml==0.6.0
# via
# python-dsv-sdk
# python-tss-sdk
defusedxml==0.7.1
# via
# python3-openid
# social-auth-core
distro==1.5.0
deprecated==1.2.13
# via redis
distro==1.8.0
# via -r /awx_devel/requirements/requirements.in
django==3.2.16
# via
@ -93,19 +99,21 @@ django==3.2.16
# django-auth-ldap
# django-cors-headers
# django-crum
# django-extensions
# django-guid
# django-oauth-toolkit
# django-polymorphic
# django-redis
# django-solo
# django-taggit
# djangorestframework
django-auth-ldap==4.0.0
django-auth-ldap==4.1.0
# via -r /awx_devel/requirements/requirements.in
django-cors-headers==3.7.0
django-cors-headers==3.13.0
# via -r /awx_devel/requirements/requirements.in
django-crum==0.7.9
# via -r /awx_devel/requirements/requirements.in
django-extensions==2.2.9
django-extensions==3.2.1
# via -r /awx_devel/requirements/requirements.in
django-guid==3.2.1
# via -r /awx_devel/requirements/requirements.in
@ -115,19 +123,19 @@ django-pglocks==1.0.4
# via -r /awx_devel/requirements/requirements.in
django-polymorphic==3.1.0
# via -r /awx_devel/requirements/requirements.in
django-redis==4.5.0
django-redis==5.2.0
# via -r /awx_devel/requirements/requirements.in
django-solo==2.0.0
# via -r /awx_devel/requirements/requirements.in
django-split-settings==1.0.0
django-split-settings==1.2.0
# via -r /awx_devel/requirements/requirements.in
django-taggit==2.1.0
django-taggit==3.0.0
# via -r /awx_devel/requirements/requirements.in
djangorestframework==3.13.1
# via -r /awx_devel/requirements/requirements.in
djangorestframework-yaml==2.0.0
# via -r /awx_devel/requirements/requirements.in
docutils==0.16
docutils==0.19
# via python-daemon
ecdsa==0.18.0
# via python-jose
@ -135,59 +143,67 @@ enum-compat==0.0.3
# via asn1
filelock==3.8.0
# via -r /awx_devel/requirements/requirements.in
frozenlist==1.3.3
# via
# aiohttp
# aiosignal
# via
# -r /awx_devel/requirements/requirements_git.txt
# django-radius
gitdb==4.0.2
gitdb==4.0.9
# via gitpython
gitpython==3.1.7
gitpython==3.1.29
# via -r /awx_devel/requirements/requirements.in
google-auth==1.35.0
google-auth==2.14.1
# via kubernetes
hiredis==1.0.1
# via aioredis
hyperlink==20.0.1
hyperlink==21.0.0
# via
# autobahn
# twisted
idna==2.9
idna==3.4
# via
# hyperlink
# requests
# twisted
# yarl
incremental==21.3.0
importlib-metadata==5.0.0
# via markdown
incremental==22.10.0
# via twisted
irc==18.0.0
inflect==6.0.2
# via jaraco-text
irc==20.1.0
# via -r /awx_devel/requirements/requirements.in
isodate==0.6.1
# via
# msrest
# python3-saml
jaraco-classes==3.1.0
jaraco-classes==3.2.3
# via jaraco-collections
jaraco-collections==3.0.0
jaraco-collections==3.8.0
# via irc
jaraco-functools==3.0.0
jaraco-context==4.1.2
# via jaraco-text
jaraco-functools==3.5.2
# via
# irc
# jaraco-text
# tempora
jaraco-logging==3.0.0
jaraco-logging==3.1.2
# via irc
jaraco-stream==3.0.0
jaraco-stream==3.0.3
# via irc
jaraco-text==3.2.0
jaraco-text==3.10.0
# via
# irc
# jaraco-collections
jinja2==3.0.3
jinja2==3.1.2
# via -r /awx_devel/requirements/requirements.in
json-log-formatter==0.3.0
json-log-formatter==0.5.1
# via -r /awx_devel/requirements/requirements.in
jsonschema==3.2.0
jsonschema==4.17.0
# via -r /awx_devel/requirements/requirements.in
kubernetes==23.3.0
kubernetes==25.3.0
# via
# -r /awx_devel/requirements/requirements.in
# openshift
@ -198,30 +214,31 @@ lxml==4.7.0
# -r /awx_devel/requirements/requirements.in
# python3-saml
# xmlsec
markdown==3.2.1
markdown==3.4.1
# via -r /awx_devel/requirements/requirements.in
markupsafe==2.0.1
markupsafe==2.1.1
# via jinja2
more-itertools==8.2.0
more-itertools==9.0.0
# via
# irc
# jaraco-classes
# jaraco-functools
msgpack==1.0.0
# jaraco-text
msgpack==1.0.4
# via channels-redis
msrest==0.6.11
msrest==0.7.1
# via
# azure-keyvault
# msrestazure
msrestazure==0.6.3
msrestazure==0.6.4
# via azure-keyvault
multidict==4.7.5
multidict==6.0.2
# via
# aiohttp
# yarl
netaddr==0.8.0
# via pyrad
oauthlib==3.2.0
oauthlib==3.2.2
# via
# django-oauth-toolkit
# requests-oauthlib
@ -231,8 +248,9 @@ openshift==0.13.1
packaging==21.3
# via
# ansible-runner
# redis
# setuptools-scm
pbr==5.6.0
pbr==5.11.0
# via -r /awx_devel/requirements/requirements.in
pexpect==4.7.0
# via
@ -240,13 +258,13 @@ pexpect==4.7.0
# ansible-runner
pkgconfig==1.5.5
# via -r /awx_devel/requirements/requirements.in
prometheus-client==0.7.1
prometheus-client==0.15.0
# via -r /awx_devel/requirements/requirements.in
psutil==5.8.0
psutil==5.9.4
# via -r /awx_devel/requirements/requirements.in
psycopg2==2.8.4
psycopg2==2.9.5
# via -r /awx_devel/requirements/requirements.in
ptyprocess==0.6.0
ptyprocess==0.7.0
# via pexpect
pyasn1==0.4.8
# via
@ -260,38 +278,40 @@ pyasn1-modules==0.2.8
# google-auth
# python-ldap
# service-identity
pycparser==2.20
pycparser==2.21
# via cffi
pygerduty==0.38.2
pydantic==1.10.2
# via inflect
pygerduty==0.38.3
# via -r /awx_devel/requirements/requirements.in
pyjwt==2.4.0
pyjwt==2.6.0
# via
# -r /awx_devel/requirements/requirements.in
# adal
# social-auth-core
# twilio
pyopenssl==19.1.0
pyopenssl==22.1.0
# via twisted
pyparsing==2.4.6
pyparsing==3.0.9
# via
# -r /awx_devel/requirements/requirements.in
# packaging
pyrad==2.4
# via django-radius
pyrsistent==0.15.7
pyrsistent==0.19.2
# via jsonschema
python-daemon==2.2.4
python-daemon==2.3.2
# via ansible-runner
python-dateutil==2.8.1
python-dateutil==2.8.2
# via
# adal
# kubernetes
# receptorctl
python-dsv-sdk==0.0.1
python-dsv-sdk==1.0.1
# via -r /awx_devel/requirements/requirements.in
python-jose==3.3.0
# via social-auth-core
python-ldap==3.4.0
python-ldap==3.4.3
# via
# -r /awx_devel/requirements/requirements.in
# django-auth-ldap
@ -299,18 +319,18 @@ python-string-utils==1.0.0
# via openshift
python-tss-sdk==1.0.0
# via -r /awx_devel/requirements/requirements.in
python3-openid==3.1.0
python3-openid==3.2.0
# via social-auth-core
python3-saml==1.13.0
# via -r /awx_devel/requirements/requirements.in
pytz==2021.3
pytz==2022.6
# via
# django
# djangorestframework
# irc
# tempora
# twilio
pyyaml==5.4.1
pyyaml==6.0
# via
# -r /awx_devel/requirements/requirements.in
# ansible-runner
@ -319,14 +339,16 @@ pyyaml==5.4.1
# receptorctl
receptorctl==1.2.3
# via -r /awx_devel/requirements/requirements.in
redis==3.4.1
redis==4.3.4
# via
# -r /awx_devel/requirements/requirements.in
# channels-redis
# django-redis
requests==2.26.0
requests==2.28.1
# via
# -r /awx_devel/requirements/requirements.in
# adal
# azure-core
# azure-keyvault
# django-oauth-toolkit
# kubernetes
@ -341,45 +363,40 @@ requests-oauthlib==1.3.1
# kubernetes
# msrest
# social-auth-core
rsa==4.7.2
rsa==4.9
# via
# google-auth
# python-jose
schedule==0.6.0
# via -r /awx_devel/requirements/requirements.in
semantic-version==2.9.0
semantic-version==2.10.0
# via setuptools-rust
service-identity==18.1.0
service-identity==21.1.0
# via twisted
setuptools-rust==1.2.0
setuptools-rust==1.5.2
# via -r /awx_devel/requirements/requirements.in
setuptools-scm[toml]==6.4.2
setuptools-scm[toml]==7.0.5
# via -r /awx_devel/requirements/requirements.in
six==1.14.0
six==1.16.0
# via
# ansible-runner
# automat
# django-extensions
# azure-core
# django-pglocks
# ecdsa
# google-auth
# isodate
# jaraco-collections
# jaraco-logging
# jaraco-text
# jsonschema
# kubernetes
# msrestazure
# openshift
# pygerduty
# pyopenssl
# pyrad
# pyrsistent
# python-dateutil
# service-identity
# tacacs-plus
# websocket-client
slack-sdk==3.11.2
slack-sdk==3.19.3
# via -r /awx_devel/requirements/requirements.in
smmap==3.0.1
smmap==5.0.0
# via gitdb
social-auth-app-django==5.0.0
# via -r /awx_devel/requirements/requirements.in
@ -387,61 +404,65 @@ social-auth-core[openidconnect]==4.3.0
# via
# -r /awx_devel/requirements/requirements.in
# social-auth-app-django
sqlparse==0.4.2
sqlparse==0.4.3
# via
# -r /awx_devel/requirements/requirements.in
# django
tacacs-plus==1.0
# via -r /awx_devel/requirements/requirements.in
tempora==2.1.0
tempora==5.0.2
# via
# irc
# jaraco-logging
tomli==2.0.1
# via setuptools-scm
twilio==7.9.1
twilio==7.15.1
# via -r /awx_devel/requirements/requirements.in
twisted[tls]==22.4.0
twisted[tls]==22.10.0
# via
# -r /awx_devel/requirements/requirements.in
# daphne
txaio==20.12.1
txaio==22.2.1
# via autobahn
typing-extensions==3.10.0.2
typing-extensions==4.4.0
# via
# aiohttp
# azure-core
# pydantic
# setuptools-rust
# setuptools-scm
# twisted
urllib3==1.26.5
urllib3==1.26.12
# via
# kubernetes
# requests
uwsgi==2.0.18
uwsgi==2.0.21
# via -r /awx_devel/requirements/requirements.in
uwsgitop==0.11
# via -r /awx_devel/requirements/requirements.in
websocket-client==0.57.0
websocket-client==1.4.2
# via kubernetes
wheel==0.36.2
wheel==0.38.4
# via -r /awx_devel/requirements/requirements.in
xmlsec==1.3.12
wrapt==1.14.1
# via deprecated
xmlsec==1.3.13
# via python3-saml
yarl==1.4.2
yarl==1.8.1
# via aiohttp
zope-interface==5.0.0
zipp==3.10.0
# via importlib-metadata
zope-interface==5.5.1
# via twisted
# The following packages are considered to be unsafe in a requirements file:
pip==21.2.4
# via -r /awx_devel/requirements/requirements.in
setuptools==58.2.0
setuptools==65.5.1
# via
# -r /awx_devel/requirements/requirements.in
# asciichartpy
# google-auth
# jsonschema
# autobahn
# kubernetes
# markdown
# python-daemon
# setuptools-rust
# setuptools-scm