Skip to content

Commit b85d937

Browse files
authored
fix: fix pip and pip-tools compatibility (openedx-unsupported#3783)
* fix: fix pip and pip-tools compatibility Add pip and pip-tools installation in make upgrade to resolve this failure in future. * fix: pin required packages * fix: rename deprecated view attribute filter_fields
1 parent 30d7a63 commit b85d937

21 files changed

+522
-387
lines changed

Makefile

+10-2
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,18 @@ validate_translations: requirements.tox
148148
check_keywords: requirements.tox
149149
tox -e $(PYTHON_ENV)-${DJANGO_ENV_VAR}-check_keywords
150150

151-
export CUSTOM_COMPILE_COMMAND = make upgrade
152-
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
151+
COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
152+
.PHONY: $(COMMON_CONSTRAINTS_TXT)
153+
$(COMMON_CONSTRAINTS_TXT):
154+
wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"
155+
156+
upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
157+
upgrade: $(COMMON_CONSTRAINTS_TXT)
153158
pip install -q -r requirements/pip_tools.txt
159+
pip-compile --rebuild --upgrade --allow-unsafe -o requirements/pip.txt requirements/pip.in
154160
pip-compile --rebuild --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
161+
pip install -qr requirements/pip.txt
162+
pip install -qr requirements/pip_tools.txt
155163
pip-compile --upgrade -o requirements/tox.txt requirements/tox.in
156164
pip-compile --upgrade -o requirements/base.txt requirements/base.in
157165
pip-compile --upgrade -o requirements/docs.txt requirements/docs.in

ecommerce/extensions/api/v2/views/enterprise.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ class OfferAssignmentEmailTemplatesViewSet(PermissionRequiredMixin, ModelViewSet
10751075
permission_classes = (IsAuthenticated,)
10761076
permission_required = 'enterprise.can_assign_coupon'
10771077
filter_backends = (django_filters.rest_framework.DjangoFilterBackend,)
1078-
filter_fields = ('email_type', 'active')
1078+
filterset_fields = ('email_type', 'active')
10791079

10801080
http_method_names = ['get', 'head', 'options', 'post', 'put', 'delete']
10811081

requirements/base.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-c pins.txt
1+
-c constraints.txt
22

33
analytics-python
44
bleach

0 commit comments

Comments
 (0)