Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating lxml #13263

Merged
merged 1 commit into from
Dec 15, 2022
+6 −34
Merged

Updating lxml #13263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions licenses/pkgconfig.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions requirements/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
16 changes: 5 additions & 11 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions requirements/requirements_git.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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