Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: sudo apt update && sudo apt install -y libxmlsec1-dev

- name: Install pip
run: python -m pip install -r requirements/pip.txt
run: make pre-requirements

- name: Get pip cache dir
id: pip-cache-dir
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-imports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: sudo apt update && sudo apt install -y libxmlsec1-dev

- name: Install pip
run: python -m pip install -r requirements/pip.txt
run: make pre-requirements

- name: Get pip cache dir
id: pip-cache-dir
Expand All @@ -40,7 +40,7 @@ jobs:
restore-keys: ${{ runner.os }}-pip-

- name: Install python dependencies
run: pip install -r requirements/edx/development.txt
run: make dev-requirements

# As long there are sub-projects[1] in edx-platform, we analyze each
# project separately here, in order to make import-linting errors easier
Expand Down
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ detect_changed_source_translations: ## check if translation files are up-to-date
i18n_tool changed

pre-requirements: ## install Python requirements for running pip-tools
pip install -r requirements/pip.txt
pip install -r requirements/pip-tools.txt

local-requirements:
Expand Down Expand Up @@ -122,12 +121,10 @@ compile-requirements: pre-requirements $(COMMON_CONSTRAINTS_TXT) ## Re-compile *
@# time someone tries to use the outputs.
sed 's/Django<5.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
sed 's/pip<24.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
sed 's/pip<25.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip-compile -v --allow-unsafe ${COMPILE_OPTS} -o requirements/pip.txt requirements/pip.in
pip install -r requirements/pip.txt

pip-compile -v ${COMPILE_OPTS} -o requirements/pip-tools.txt requirements/pip-tools.in
pip-compile -v --allow-unsafe ${COMPILE_OPTS} -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -r requirements/pip-tools.txt

@ export REBUILD='--rebuild'; \
Expand Down
2 changes: 1 addition & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ elasticsearch<7.14.0
# See issue https://github.com/openedx/public-engineering/issues/440 for details regarding the ongoing fix.
# The constraint can be removed once a release (pip-tools > 7.5.1) is available with support for pip 25.3
# Issue to track this dependency and unpin later on: https://github.com/openedx/edx-lint/issues/503
pip<25.3

6 changes: 4 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@ wheel==0.45.1
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
pip==25.3
# via pip-tools
setuptools==80.9.0
# via pip-tools
6 changes: 0 additions & 6 deletions requirements/pip.in

This file was deleted.

16 changes: 0 additions & 16 deletions requirements/pip.txt

This file was deleted.

Loading