Skip to content

Commit

Permalink
Revert "build: Python requirements upgrade and lxml build without bin…
Browse files Browse the repository at this point in the history
…ary (#34…" (#34661)

This reverts commit 52adce4 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.
```
  • Loading branch information
timmc-edx authored Apr 29, 2024
1 parent e52f283 commit afe9355
Show file tree
Hide file tree
Showing 22 changed files with 415 additions and 437 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/check-consistent-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ jobs:
with:
python-version: '3.8'

- name: setup dev for lxml dependency
if: ${{ env.RELEVANT == 'true' }}
run: |
sudo apt-get update && sudo apt-get install -y libxml2-dev libxslt-dev
- name: "Recompile requirements"
if: ${{ env.RELEVANT == 'true' }}
run: |
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ jobs:
sudo mkdir -p /data/db
sudo chmod -R a+rw /data/db
mongod &
- name: setup dev for lxml dependency
run: |
sudo apt-get update && sudo apt-get install -y libxml2-dev libxslt-dev
- name: install requirements
run: |
sudo make test-requirements
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/units-test-scripts-user-retirement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: setup dev for lxml dependency
run: |
sudo apt-get update && sudo apt-get install -y libxml2-dev libxslt-dev
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/upgrade-one-python-dependency.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ jobs:
with:
python-version: "3.8"

- name: setup dev for lxml dependency
run: |
sudo apt-get update && sudo apt-get install -y libxml2-dev libxslt-dev
- name: Update any pinned dependencies
env:
NEW_VERSION: "${{ inputs.version }}"
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx-sandbox/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

chem # A helper library for chemistry calculations
cryptography # Implementations of assorted cryptography algorithms
lxml --no-binary lxml # XML parser
lxml # XML parser
matplotlib # 2D plotting library
networkx # Utilities for creating, manipulating, and studying network graphs
nltk # Natural language processing; used by the chem package
Expand Down
20 changes: 9 additions & 11 deletions requirements/edx-sandbox/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#
# make upgrade
#
--no-binary lxml

cffi==1.16.0
# via cryptography
chem==1.3.0
Expand All @@ -24,11 +22,11 @@ cryptography==38.0.4
# -r requirements/edx-sandbox/base.in
cycler==0.12.1
# via matplotlib
fonttools==4.51.0
fonttools==4.49.0
# via matplotlib
importlib-resources==6.4.0
importlib-resources==6.1.1
# via matplotlib
joblib==1.4.0
joblib==1.3.2
# via nltk
kiwisolver==1.4.5
# via matplotlib
Expand Down Expand Up @@ -61,21 +59,21 @@ openedx-calc==3.1.0
# via -r requirements/edx-sandbox/base.in
packaging==24.0
# via matplotlib
pillow==10.3.0
pillow==10.2.0
# via matplotlib
pycparser==2.22
pycparser==2.21
# via cffi
pyparsing==3.1.2
pyparsing==3.1.1
# via
# -r requirements/edx-sandbox/base.in
# chem
# matplotlib
# openedx-calc
python-dateutil==2.9.0.post0
python-dateutil==2.8.2
# via matplotlib
random2==1.0.2
# via -r requirements/edx-sandbox/base.in
regex==2024.4.28
regex==2024.4.16
# via nltk
scipy==1.7.3
# via
Expand All @@ -93,5 +91,5 @@ sympy==1.12
# openedx-calc
tqdm==4.66.2
# via nltk
zipp==3.18.1
zipp==3.17.0
# via importlib-resources
Loading

0 comments on commit afe9355

Please sign in to comment.