summaryrefslogtreecommitdiffstats
path: root/requirements
diff options
context:
space:
mode:
authorJohn Westcott IV <32551173+john-westcott-iv@users.noreply.github.com>2022-12-15 16:15:09 +0100
committerGitHub <noreply@github.com>2022-12-15 16:15:09 +0100
commit7129f3e8cdac1b2ee9e3a938459cc9552210b64f (patch)
tree4d3d8edc21d8349e5c0b97492cf8db5049a84af2 /requirements
parentMerge pull request #13126 from infamousjoeg/cyberark-ccp-branding-webserviceid (diff)
downloadawx-7129f3e8cdac1b2ee9e3a938459cc9552210b64f.tar.xz
awx-7129f3e8cdac1b2ee9e3a938459cc9552210b64f.zip
Updating python3-saml (#13263)
Moved to forked version to get latest lxml to allow other pacakges to update
Diffstat (limited to 'requirements')
-rw-r--r--requirements/requirements.in4
-rw-r--r--requirements/requirements.txt16
-rw-r--r--requirements/requirements_git.txt1
3 files changed, 6 insertions, 15 deletions
diff --git a/requirements/requirements.in b/requirements/requirements.in
index bb0b915ff7..ef4122991d 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -38,7 +38,6 @@ psycopg2
psutil
pygerduty
pyparsing==2.4.6 # Upgrading to v3 of pyparsing introduce errors on smart host filtering: Expected 'or' term, found 'or' (at char 15), (line:1, col:16)
-python3-saml==1.13.0
python-dsv-sdk
python-tss-sdk==1.0.0
python-ldap
@@ -59,9 +58,6 @@ wheel
pip==21.2.4 # see UPGRADE BLOCKERs
setuptools # see UPGRADE BLOCKERs
setuptools_scm[toml] # see UPGRADE BLOCKERs, xmlsec build dep
-xmlsec==1.3.12 # xmlsec 1.3.13 removed the ability to use lxml 4.7.0 but python3-saml requires lxml 4.7.0 so we need to pin xmlsec
-lxml>=3.8 # xmlsec build dep
-pkgconfig>=1.5.1 # xmlsec build dep
setuptools-rust >= 0.11.4 # cryptography build dep
# Temporarily added to use ansible-runner from git branch, to be removed
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index a56ec5b7b4..a567675c62 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -198,15 +198,14 @@ jinja2==3.1.2
# via -r /awx_devel/requirements/requirements.in
json-log-formatter==0.5.1
# via -r /awx_devel/requirements/requirements.in
-jsonschema==4.17.1
+jsonschema==4.17.3
# via -r /awx_devel/requirements/requirements.in
kubernetes==25.3.0
# via openshift
lockfile==0.12.2
# via python-daemon
-lxml==4.7.0
+lxml==4.9.1
# via
- # -r /awx_devel/requirements/requirements.in
# python3-saml
# xmlsec
markdown==3.4.1
@@ -251,8 +250,6 @@ pexpect==4.7.0
# via
# -r /awx_devel/requirements/requirements.in
# ansible-runner
-pkgconfig==1.5.5
- # via -r /awx_devel/requirements/requirements.in
prometheus-client==0.15.0
# via -r /awx_devel/requirements/requirements.in
psutil==5.9.4
@@ -315,8 +312,7 @@ python-tss-sdk==1.0.0
# via -r /awx_devel/requirements/requirements.in
python3-openid==3.2.0
# via social-auth-core
-python3-saml==1.13.0
- # via -r /awx_devel/requirements/requirements.in
+ # via -r /awx_devel/requirements/requirements_git.txt
pytz==2022.6
# via
# django
@@ -435,10 +431,8 @@ websocket-client==1.4.2
# via kubernetes
wheel==0.38.4
# via -r /awx_devel/requirements/requirements.in
-xmlsec==1.3.12
- # via
- # -r /awx_devel/requirements/requirements.in
- # python3-saml
+xmlsec==1.3.13
+ # via python3-saml
yarl==1.8.1
# via aiohttp
zipp==3.11.0
diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt
index ab13d9aed2..df424cca95 100644
--- a/requirements/requirements_git.txt
+++ b/requirements/requirements_git.txt
@@ -4,3 +4,4 @@ git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner
# django-radius has an aggressive pin of future==0.16.0, see https://github.com/robgolding/django-radius/pull/25
git+https://github.com/ansible/django-radius.git@develop#egg=django-radius
git+https://github.com/PythonCharmers/python-future@master#egg=future
+git+https://github.com/ansible/python3-saml.git@devel#egg=python3-saml