Revert "build: Python requirements upgrade and lxml build without binary (#34…" (#34661)
This reverts commit 52adce48d1 because we were getting this in the build pipeline:
```
WARNING: lxml 5.2.1 does not provide the extra 'html-clean'
ERROR: Exception:
Traceback (most recent call last):
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_internal/cli/base_command.py", line 173, in _main
status = self.run(options, args)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_internal/cli/req_command.py", line 203, in wrapper
return func(self, options, args)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_internal/commands/install.py", line 315, in run
requirement_set = resolver.resolve(
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_internal/resolution/resolvelib/resolver.py", line 94, in resolve
result = self._result = resolver.resolve(
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_vendor/resolvelib/resolvers.py", line 472, in resolve
state = resolution.resolve(requirements, max_rounds=max_rounds)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_vendor/resolvelib/resolvers.py", line 366, in resolve
failure_causes = self._attempt_to_pin_criterion(name)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_vendor/resolvelib/resolvers.py", line 221, in _attempt_to_pin_criterion
satisfied = all(
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_vendor/resolvelib/resolvers.py", line 222, in <genexpr>
self._p.is_satisfied_by(requirement=r, candidate=candidate)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_internal/resolution/resolvelib/provider.py", line 178, in is_satisfied_by
return requirement.is_satisfied_by(candidate)
File "/edx/app/edxapp/venvs/edxapp/lib/python3.8/site-packages/pip/_internal/resolution/resolvelib/requirements.py", line 84, in is_satisfied_by
assert candidate.name == self.name, (
AssertionError: Internal issue: Candidate is not for this requirement lxml[html-clean,html-clean] vs lxml[html-clean]
WARNING: You are using pip version 21.2.1; however, version 24.0 is available.
You should consider upgrading via the '/edx/app/edxapp/venvs/edxapp/bin/python -m pip install --upgrade pip' command.
```
This commit is contained in:
Tim McCormack
@@ -11,7 +11,7 @@ click==8.1.6
|
||||
# click-log
|
||||
click-log==0.4.0
|
||||
# via -r scripts/structures_pruning/requirements/base.in
|
||||
edx-opaque-keys==2.9.0
|
||||
edx-opaque-keys==2.5.1
|
||||
# via -r scripts/structures_pruning/requirements/base.in
|
||||
pbr==6.0.0
|
||||
# via stevedore
|
||||
@@ -22,5 +22,5 @@ pymongo==3.13.0
|
||||
# edx-opaque-keys
|
||||
stevedore==5.2.0
|
||||
# via edx-opaque-keys
|
||||
typing-extensions==4.11.0
|
||||
typing-extensions==4.10.0
|
||||
# via edx-opaque-keys
|
||||
|
||||
@@ -12,9 +12,9 @@ click-log==0.4.0
|
||||
# via -r scripts/structures_pruning/requirements/base.txt
|
||||
ddt==1.7.2
|
||||
# via -r scripts/structures_pruning/requirements/testing.in
|
||||
edx-opaque-keys==2.9.0
|
||||
edx-opaque-keys==2.5.1
|
||||
# via -r scripts/structures_pruning/requirements/base.txt
|
||||
exceptiongroup==1.2.1
|
||||
exceptiongroup==1.2.0
|
||||
# via pytest
|
||||
iniconfig==2.0.0
|
||||
# via pytest
|
||||
@@ -24,13 +24,13 @@ pbr==6.0.0
|
||||
# via
|
||||
# -r scripts/structures_pruning/requirements/base.txt
|
||||
# stevedore
|
||||
pluggy==1.5.0
|
||||
pluggy==1.4.0
|
||||
# via pytest
|
||||
pymongo==3.13.0
|
||||
# via
|
||||
# -r scripts/structures_pruning/requirements/base.txt
|
||||
# edx-opaque-keys
|
||||
pytest==8.2.0
|
||||
pytest==8.1.1
|
||||
# via -r scripts/structures_pruning/requirements/testing.in
|
||||
stevedore==5.2.0
|
||||
# via
|
||||
@@ -38,7 +38,7 @@ stevedore==5.2.0
|
||||
# edx-opaque-keys
|
||||
tomli==2.0.1
|
||||
# via pytest
|
||||
typing-extensions==4.11.0
|
||||
typing-extensions==4.10.0
|
||||
# via
|
||||
# -r scripts/structures_pruning/requirements/base.txt
|
||||
# edx-opaque-keys
|
||||
|
||||
@@ -11,4 +11,3 @@ unicodecsv
|
||||
simplejson
|
||||
simple-salesforce
|
||||
google-api-python-client
|
||||
lxml --no-binary lxml
|
||||
|
||||
@@ -4,25 +4,25 @@
|
||||
#
|
||||
# make upgrade
|
||||
#
|
||||
--no-binary lxml
|
||||
|
||||
asgiref==3.8.1
|
||||
asgiref==3.7.2
|
||||
# via django
|
||||
attrs==23.2.0
|
||||
# via zeep
|
||||
backoff==2.2.1
|
||||
# via -r scripts/user_retirement/requirements/base.in
|
||||
backports-zoneinfo==0.2.1
|
||||
# via django
|
||||
boto3==1.34.93
|
||||
# via
|
||||
# django
|
||||
# pendulum
|
||||
boto3==1.34.26
|
||||
# via -r scripts/user_retirement/requirements/base.in
|
||||
botocore==1.34.93
|
||||
botocore==1.34.26
|
||||
# via
|
||||
# boto3
|
||||
# s3transfer
|
||||
cachetools==5.3.3
|
||||
cachetools==5.3.2
|
||||
# via google-auth
|
||||
certifi==2024.2.2
|
||||
certifi==2023.11.17
|
||||
# via requests
|
||||
cffi==1.16.0
|
||||
# via
|
||||
@@ -40,8 +40,8 @@ click==8.1.6
|
||||
cryptography==38.0.4
|
||||
# via
|
||||
# -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
|
||||
# pyjwt
|
||||
django==4.2.11
|
||||
# simple-salesforce
|
||||
django==4.2.9
|
||||
# via
|
||||
# -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt
|
||||
# -c scripts/user_retirement/requirements/../../../requirements/constraints.txt
|
||||
@@ -56,25 +56,27 @@ edx-django-utils==5.12.0
|
||||
# via edx-rest-api-client
|
||||
edx-rest-api-client==5.7.0
|
||||
# via -r scripts/user_retirement/requirements/base.in
|
||||
google-api-core==2.18.0
|
||||
google-api-core==2.15.0
|
||||
# via google-api-python-client
|
||||
google-api-python-client==2.127.0
|
||||
google-api-python-client==2.115.0
|
||||
# via -r scripts/user_retirement/requirements/base.in
|
||||
google-auth==2.29.0
|
||||
google-auth==2.26.2
|
||||
# via
|
||||
# google-api-core
|
||||
# google-api-python-client
|
||||
# google-auth-httplib2
|
||||
google-auth-httplib2==0.2.0
|
||||
# via google-api-python-client
|
||||
googleapis-common-protos==1.63.0
|
||||
googleapis-common-protos==1.62.0
|
||||
# via google-api-core
|
||||
httplib2==0.22.0
|
||||
# via
|
||||
# google-api-python-client
|
||||
# google-auth-httplib2
|
||||
idna==3.7
|
||||
idna==3.6
|
||||
# via requests
|
||||
importlib-resources==6.1.1
|
||||
# via pendulum
|
||||
isodate==0.6.1
|
||||
# via zeep
|
||||
jenkinsapi==0.3.13
|
||||
@@ -83,46 +85,46 @@ jmespath==1.0.1
|
||||
# via
|
||||
# boto3
|
||||
# botocore
|
||||
lxml==5.2.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.in
|
||||
# zeep
|
||||
lxml==4.9.3
|
||||
# via zeep
|
||||
more-itertools==10.2.0
|
||||
# via simple-salesforce
|
||||
newrelic==9.9.0
|
||||
newrelic==9.5.0
|
||||
# via edx-django-utils
|
||||
pbr==6.0.0
|
||||
# via stevedore
|
||||
platformdirs==4.2.1
|
||||
pendulum==3.0.0
|
||||
# via simple-salesforce
|
||||
platformdirs==4.1.0
|
||||
# via zeep
|
||||
proto-plus==1.23.0
|
||||
# via google-api-core
|
||||
protobuf==4.25.3
|
||||
protobuf==4.25.2
|
||||
# via
|
||||
# google-api-core
|
||||
# googleapis-common-protos
|
||||
# proto-plus
|
||||
psutil==5.9.8
|
||||
# via edx-django-utils
|
||||
pyasn1==0.6.0
|
||||
pyasn1==0.5.1
|
||||
# via
|
||||
# pyasn1-modules
|
||||
# rsa
|
||||
pyasn1-modules==0.4.0
|
||||
pyasn1-modules==0.3.0
|
||||
# via google-auth
|
||||
pycparser==2.22
|
||||
pycparser==2.21
|
||||
# via cffi
|
||||
pyjwt[crypto]==2.8.0
|
||||
pyjwt==2.8.0
|
||||
# via
|
||||
# edx-rest-api-client
|
||||
# simple-salesforce
|
||||
pynacl==1.5.0
|
||||
# via edx-django-utils
|
||||
pyparsing==3.1.2
|
||||
pyparsing==3.1.1
|
||||
# via httplib2
|
||||
python-dateutil==2.9.0.post0
|
||||
# via botocore
|
||||
pytz==2024.1
|
||||
python-dateutil==2.8.2
|
||||
# via
|
||||
# botocore
|
||||
# pendulum
|
||||
# time-machine
|
||||
pytz==2023.3.post1
|
||||
# via
|
||||
# jenkinsapi
|
||||
# zeep
|
||||
@@ -139,15 +141,15 @@ requests==2.31.0
|
||||
# simple-salesforce
|
||||
# slumber
|
||||
# zeep
|
||||
requests-file==2.0.0
|
||||
requests-file==1.5.1
|
||||
# via zeep
|
||||
requests-toolbelt==1.0.0
|
||||
# via zeep
|
||||
rsa==4.9
|
||||
# via google-auth
|
||||
s3transfer==0.10.1
|
||||
s3transfer==0.10.0
|
||||
# via boto3
|
||||
simple-salesforce==1.12.6
|
||||
simple-salesforce==1.12.5
|
||||
# via -r scripts/user_retirement/requirements/base.in
|
||||
simplejson==3.19.2
|
||||
# via -r scripts/user_retirement/requirements/base.in
|
||||
@@ -156,16 +158,19 @@ six==1.16.0
|
||||
# isodate
|
||||
# jenkinsapi
|
||||
# python-dateutil
|
||||
# requests-file
|
||||
slumber==0.7.1
|
||||
# via edx-rest-api-client
|
||||
sqlparse==0.5.0
|
||||
sqlparse==0.4.4
|
||||
# via django
|
||||
stevedore==5.2.0
|
||||
stevedore==5.1.0
|
||||
# via edx-django-utils
|
||||
typing-extensions==4.11.0
|
||||
# via
|
||||
# asgiref
|
||||
# simple-salesforce
|
||||
time-machine==2.13.0
|
||||
# via pendulum
|
||||
typing-extensions==4.9.0
|
||||
# via asgiref
|
||||
tzdata==2023.4
|
||||
# via pendulum
|
||||
unicodecsv==0.14.1
|
||||
# via -r scripts/user_retirement/requirements/base.in
|
||||
uritemplate==4.1.1
|
||||
@@ -177,3 +182,5 @@ urllib3==1.26.18
|
||||
# requests
|
||||
zeep==4.2.1
|
||||
# via simple-salesforce
|
||||
zipp==3.17.0
|
||||
# via importlib-resources
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
#
|
||||
# make upgrade
|
||||
#
|
||||
--no-binary lxml
|
||||
|
||||
asgiref==3.8.1
|
||||
asgiref==3.7.2
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# django
|
||||
@@ -20,21 +18,22 @@ backports-zoneinfo==0.2.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# django
|
||||
boto3==1.34.93
|
||||
# pendulum
|
||||
boto3==1.34.26
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# moto
|
||||
botocore==1.34.93
|
||||
botocore==1.34.26
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# boto3
|
||||
# moto
|
||||
# s3transfer
|
||||
cachetools==5.3.3
|
||||
cachetools==5.3.2
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-auth
|
||||
certifi==2024.2.2
|
||||
certifi==2023.11.17
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# requests
|
||||
@@ -55,10 +54,10 @@ cryptography==38.0.4
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# moto
|
||||
# pyjwt
|
||||
ddt==1.7.2
|
||||
# simple-salesforce
|
||||
ddt==1.7.1
|
||||
# via -r scripts/user_retirement/requirements/testing.in
|
||||
django==4.2.11
|
||||
django==4.2.9
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# django-crum
|
||||
@@ -78,15 +77,15 @@ edx-django-utils==5.12.0
|
||||
# edx-rest-api-client
|
||||
edx-rest-api-client==5.7.0
|
||||
# via -r scripts/user_retirement/requirements/base.txt
|
||||
exceptiongroup==1.2.1
|
||||
exceptiongroup==1.2.0
|
||||
# via pytest
|
||||
google-api-core==2.18.0
|
||||
google-api-core==2.15.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-api-python-client
|
||||
google-api-python-client==2.127.0
|
||||
google-api-python-client==2.115.0
|
||||
# via -r scripts/user_retirement/requirements/base.txt
|
||||
google-auth==2.29.0
|
||||
google-auth==2.26.2
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-api-core
|
||||
@@ -96,7 +95,7 @@ google-auth-httplib2==0.2.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-api-python-client
|
||||
googleapis-common-protos==1.63.0
|
||||
googleapis-common-protos==1.62.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-api-core
|
||||
@@ -105,10 +104,14 @@ httplib2==0.22.0
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-api-python-client
|
||||
# google-auth-httplib2
|
||||
idna==3.7
|
||||
idna==3.6
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# requests
|
||||
importlib-resources==6.1.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# pendulum
|
||||
iniconfig==2.0.0
|
||||
# via pytest
|
||||
isodate==0.6.1
|
||||
@@ -124,11 +127,11 @@ jmespath==1.0.1
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# boto3
|
||||
# botocore
|
||||
lxml==5.2.1
|
||||
lxml==4.9.3
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# zeep
|
||||
markupsafe==2.1.5
|
||||
markupsafe==2.1.4
|
||||
# via
|
||||
# jinja2
|
||||
# werkzeug
|
||||
@@ -138,52 +141,51 @@ more-itertools==10.2.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# simple-salesforce
|
||||
moto==4.2.14
|
||||
moto==4.2.13
|
||||
# via -r scripts/user_retirement/requirements/testing.in
|
||||
newrelic==9.9.0
|
||||
newrelic==9.5.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# edx-django-utils
|
||||
packaging==24.0
|
||||
packaging==23.2
|
||||
# via pytest
|
||||
pbr==6.0.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# stevedore
|
||||
platformdirs==4.2.1
|
||||
pendulum==3.0.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# simple-salesforce
|
||||
platformdirs==4.1.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# zeep
|
||||
pluggy==1.5.0
|
||||
pluggy==1.3.0
|
||||
# via pytest
|
||||
proto-plus==1.23.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-api-core
|
||||
protobuf==4.25.3
|
||||
protobuf==4.25.2
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-api-core
|
||||
# googleapis-common-protos
|
||||
# proto-plus
|
||||
psutil==5.9.8
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# edx-django-utils
|
||||
pyasn1==0.6.0
|
||||
pyasn1==0.5.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# pyasn1-modules
|
||||
# rsa
|
||||
pyasn1-modules==0.4.0
|
||||
pyasn1-modules==0.3.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-auth
|
||||
pycparser==2.22
|
||||
pycparser==2.21
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# cffi
|
||||
pyjwt[crypto]==2.8.0
|
||||
pyjwt==2.8.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# edx-rest-api-client
|
||||
@@ -192,18 +194,20 @@ pynacl==1.5.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# edx-django-utils
|
||||
pyparsing==3.1.2
|
||||
pyparsing==3.1.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# httplib2
|
||||
pytest==8.2.0
|
||||
pytest==7.4.4
|
||||
# via -r scripts/user_retirement/requirements/testing.in
|
||||
python-dateutil==2.9.0.post0
|
||||
python-dateutil==2.8.2
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# botocore
|
||||
# moto
|
||||
pytz==2024.1
|
||||
# pendulum
|
||||
# time-machine
|
||||
pytz==2023.3.post1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# jenkinsapi
|
||||
@@ -226,17 +230,17 @@ requests==2.31.0
|
||||
# simple-salesforce
|
||||
# slumber
|
||||
# zeep
|
||||
requests-file==2.0.0
|
||||
requests-file==1.5.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# zeep
|
||||
requests-mock==1.12.1
|
||||
requests-mock==1.11.0
|
||||
# via -r scripts/user_retirement/requirements/testing.in
|
||||
requests-toolbelt==1.0.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# zeep
|
||||
responses==0.25.0
|
||||
responses==0.24.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/testing.in
|
||||
# moto
|
||||
@@ -244,11 +248,11 @@ rsa==4.9
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# google-auth
|
||||
s3transfer==0.10.1
|
||||
s3transfer==0.10.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# boto3
|
||||
simple-salesforce==1.12.6
|
||||
simple-salesforce==1.12.5
|
||||
# via -r scripts/user_retirement/requirements/base.txt
|
||||
simplejson==3.19.2
|
||||
# via -r scripts/user_retirement/requirements/base.txt
|
||||
@@ -258,25 +262,34 @@ six==1.16.0
|
||||
# isodate
|
||||
# jenkinsapi
|
||||
# python-dateutil
|
||||
# requests-file
|
||||
# requests-mock
|
||||
slumber==0.7.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# edx-rest-api-client
|
||||
sqlparse==0.5.0
|
||||
sqlparse==0.4.4
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# django
|
||||
stevedore==5.2.0
|
||||
stevedore==5.1.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# edx-django-utils
|
||||
time-machine==2.13.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# pendulum
|
||||
tomli==2.0.1
|
||||
# via pytest
|
||||
typing-extensions==4.11.0
|
||||
typing-extensions==4.9.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# asgiref
|
||||
# simple-salesforce
|
||||
tzdata==2023.4
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# pendulum
|
||||
unicodecsv==0.14.1
|
||||
# via -r scripts/user_retirement/requirements/base.txt
|
||||
uritemplate==4.1.1
|
||||
@@ -289,7 +302,7 @@ urllib3==1.26.18
|
||||
# botocore
|
||||
# requests
|
||||
# responses
|
||||
werkzeug==3.0.2
|
||||
werkzeug==3.0.1
|
||||
# via moto
|
||||
xmltodict==0.13.0
|
||||
# via moto
|
||||
@@ -297,3 +310,7 @@ zeep==4.2.1
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# simple-salesforce
|
||||
zipp==3.17.0
|
||||
# via
|
||||
# -r scripts/user_retirement/requirements/base.txt
|
||||
# importlib-resources
|
||||
|
||||
@@ -10,7 +10,7 @@ charset-normalizer==2.0.12
|
||||
# via
|
||||
# -c scripts/xblock/../../requirements/constraints.txt
|
||||
# requests
|
||||
idna==3.7
|
||||
idna==3.6
|
||||
# via requests
|
||||
requests==2.31.0
|
||||
# via -r scripts/xblock/requirements.in
|
||||
|
||||
Reference in New Issue
Block a user