Skip to content

Commit

Permalink
chore: install custom openedx-events and make upgrade
Browse files Browse the repository at this point in the history
ENT-9213
  • Loading branch information
pwnage101 committed Aug 6, 2024
1 parent e2927fb commit 29dad8b
Show file tree
Hide file tree
Showing 13 changed files with 362 additions and 311 deletions.
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version: 2
build:
os: "ubuntu-20.04"
tools:
python: "3.8"
python: "3.11"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ check_pins: $(COMMON_CONSTRAINTS_TXT) ## check that our local copy of edx-platfo
sed -i.tmp '/^prompt-toolkit==/d' $(LOCAL_EDX_PINS)
sed -i.tmp '/^vine==/d' $(LOCAL_EDX_PINS)
sed -i.tmp '/^django-simple-history==/d' $(LOCAL_EDX_PINS)
# openedx-events requirement pin is removed until 9.12.0 can be required in platform.
sed -i.tmp '/^openedx-events==/d' $(LOCAL_EDX_PINS)


rm requirements/*.txt.tmp
Expand Down
4 changes: 4 additions & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ edx-tincan-py35
edx-toggles
jsondiff
jsonfield
# openedx-events
paramiko
path.py
pillow
Expand All @@ -48,3 +49,6 @@ openai
django-oauth-toolkit

# Explicitly pinned packages. Anything pinned here must match edx-platform's pinned packages.

# Temporary pin to a fork to use new enterprise events
git+https://github.com/pwnage101/openedx-events.git@f00926ae93e84a114779a0e9c98c152e8927706d#egg=openedx_events
4 changes: 1 addition & 3 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -20,8 +20,6 @@ py==1.11.0
# via tox
six==1.16.0
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c requirements/constraints.txt
Expand Down
8 changes: 8 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
Expand All @@ -30,3 +31,10 @@ elasticsearch<7.14.0
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7

# Cause: https://github.com/openedx/event-tracking/pull/290
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
# We will pin event-tracking to do not break existing installations
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
# has been resolved and edx-platform is running with pymongo>=4.4.0
event-tracking<2.4.1
Loading

0 comments on commit 29dad8b

Please sign in to comment.