External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-21 13:10:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6404 from ryanpetrello/pyyaml-upgrade

Browse Source 
pin a minimum pyyaml version to address (CVE-2017-18342)

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-03-24 23:48:01 +00:00
committed by GitHub
parent b5776c8eb3 65cafa37c7
commit 08bd445caf
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
requirements/requirements.in
View File

@@ -27,7 +27,7 @@ irc
jinja2 jinja2
jsonschema jsonschema
Markdown # used for formatting API help Markdown # used for formatting API help
openshift openshift>=0.11.0 # minimum version to pull in new pyyaml for CVE-2017-18342
pexpect==4.7.0 # see library notes pexpect==4.7.0 # see library notes
prometheus_client prometheus_client
psycopg2 psycopg2
@@ -36,6 +36,7 @@ pyparsing
python-memcached python-memcached
python-radius python-radius
python3-saml python3-saml
pyyaml>=5.3.1 # minimum version to pull in new pyyaml for CVE-2017-18342
schedule==0.6.0 schedule==0.6.0
social-auth-core==3.2.0 # see UPGRADE BLOCKERs social-auth-core==3.2.0 # see UPGRADE BLOCKERs
social-auth-app-django==3.1.0 # see UPGRADE BLOCKERs social-auth-app-django==3.1.0 # see UPGRADE BLOCKERs

6
requirements/requirements.txt
View File

@@ -61,7 +61,7 @@ jaraco.stream==3.0.0 # via irc
jaraco.text==3.2.0 # via irc, jaraco.collections jaraco.text==3.2.0 # via irc, jaraco.collections
jinja2==2.11.1 # via -r /awx_devel/requirements/requirements.in, openshift jinja2==2.11.1 # via -r /awx_devel/requirements/requirements.in, openshift
jsonschema==3.2.0 # via -r /awx_devel/requirements/requirements.in jsonschema==3.2.0 # via -r /awx_devel/requirements/requirements.in
kubernetes==10.1.0 # via openshift kubernetes==11.0.0 # via openshift
lockfile==0.12.2 # via python-daemon lockfile==0.12.2 # via python-daemon
lxml==4.5.0 # via xmlsec lxml==4.5.0 # via xmlsec
markdown==3.2.1 # via -r /awx_devel/requirements/requirements.in markdown==3.2.1 # via -r /awx_devel/requirements/requirements.in
@@ -73,7 +73,7 @@ msrestazure==0.6.3 # via azure-keyvault
multidict==4.7.5 # via aiohttp, yarl multidict==4.7.5 # via aiohttp, yarl
netaddr==0.7.19 # via pyrad netaddr==0.7.19 # via pyrad
oauthlib==3.1.0 # via django-oauth-toolkit, requests-oauthlib, social-auth-core oauthlib==3.1.0 # via django-oauth-toolkit, requests-oauthlib, social-auth-core
openshift==0.10.3 # via -r /awx_devel/requirements/requirements.in openshift==0.11.0 # via -r /awx_devel/requirements/requirements.in
pexpect==4.7.0 # via -r /awx_devel/requirements/requirements.in, ansible-runner pexpect==4.7.0 # via -r /awx_devel/requirements/requirements.in, ansible-runner
pkgconfig==1.5.1 # via xmlsec pkgconfig==1.5.1 # via xmlsec
prometheus-client==0.7.1 # via -r /awx_devel/requirements/requirements.in prometheus-client==0.7.1 # via -r /awx_devel/requirements/requirements.in
@@ -99,7 +99,7 @@ python-string-utils==1.0.0 # via openshift
python3-openid==3.1.0 # via social-auth-core python3-openid==3.1.0 # via social-auth-core
python3-saml==1.9.0 # via -r /awx_devel/requirements/requirements.in python3-saml==1.9.0 # via -r /awx_devel/requirements/requirements.in
pytz==2019.3 # via django, irc, tempora, twilio pytz==2019.3 # via django, irc, tempora, twilio
pyyaml==3.13 # via ansible-runner, djangorestframework-yaml, kubernetes pyyaml==5.3.1 # via -r /awx_devel/requirements/requirements.in, ansible-runner, djangorestframework-yaml, kubernetes
redis==3.4.1 # via -r /awx_devel/requirements/requirements.in redis==3.4.1 # via -r /awx_devel/requirements/requirements.in
requests-futures==1.0.0 # via -r /awx_devel/requirements/requirements.in requests-futures==1.0.0 # via -r /awx_devel/requirements/requirements.in
requests-oauthlib==1.3.0 # via kubernetes, msrest, social-auth-core requests-oauthlib==1.3.0 # via kubernetes, msrest, social-auth-core