Skip to content

Commit

Permalink
feat: add algoliasearch in base.in
Browse files Browse the repository at this point in the history
  • Loading branch information
0x29a committed Nov 18, 2023
1 parent 4e6e348 commit e74f608
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 4 deletions.
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,14 @@ docs: ## generate Sphinx HTML documentation, including API docs
# Define PIP_COMPILE_OPTS=-v to get more information during make upgrade.
PIP_COMPILE = pip-compile --upgrade --rebuild $(PIP_COMPILE_OPTS)
LOCAL_EDX_PINS = requirements/edx-platform-constraints.txt
PLATFORM_BASE_REQS = https://raw.githubusercontent.com/edx/edx-platform/master/requirements/edx/base.txt
# edx-enterprise can't work alone and thus doesn't have it's own requirements. It pulls base requirements
# file from edx-platform and constrains it's own requirements (mostly for the test environment) using it.
PLATFORM_BASE_REQS = https://raw.githubusercontent.com/open-craft/edx-platform/opencraft-release/nutmeg.2/requirements/edx/base.txt
COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
.PHONY: $(COMMON_CONSTRAINTS_TXT)
$(COMMON_CONSTRAINTS_TXT):
wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"
# Requirements were upgraded 15 February 2022. This commit was added to `edx-lint` on 14 February 2022.
wget -O "$(@)" https://raw.githubusercontent.com/openedx/edx-lint/7dce0b15b1e8ef402bc8ad0d160a4a2516d079fe/edx_lint/files/common_constraints.txt || touch "$(@)"
echo "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@)

check_pins: $(COMMON_CONSTRAINTS_TXT) ## check that our local copy of edx-platform pins is accurate
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# This file contains the dependencies explicitly needed for this library.
#
# Packages directly used by this library that we do not need pinned to a specific version.
algoliasearch
bleach
celery
code-annotations
Expand Down
6 changes: 6 additions & 0 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ alabaster==0.7.12
# via
# -r requirements/doc.txt
# sphinx
algoliasearch==2.6.3
# via
# -r requirements/doc.txt
# -r requirements/test-master.txt
# -r requirements/test.txt
amqp==5.0.9
# via
# -r requirements/doc.txt
Expand Down Expand Up @@ -561,6 +566,7 @@ requests==2.27.1
# -r requirements/doc.txt
# -r requirements/test-master.txt
# -r requirements/test.txt
# algoliasearch
# edx-drf-extensions
# edx-rest-api-client
# pyjwkest
Expand Down
3 changes: 3 additions & 0 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
#
alabaster==0.7.12
# via sphinx
algoliasearch==2.6.3
# via -r requirements/test-master.txt
amqp==5.0.9
# via
# -r requirements/test-master.txt
Expand Down Expand Up @@ -279,6 +281,7 @@ readme-renderer==32.0
requests==2.27.1
# via
# -r requirements/test-master.txt
# algoliasearch
# edx-drf-extensions
# edx-rest-api-client
# pyjwkest
Expand Down
8 changes: 6 additions & 2 deletions requirements/edx-platform-constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ aiohttp==3.8.1
# via geoip2
aiosignal==1.2.0
# via aiohttp
algoliasearch==2.6.3
# via -r requirements/edx/base.in
# via kombu
analytics-python==1.4.0
# via -r requirements/edx/base.in
Expand Down Expand Up @@ -685,7 +687,8 @@ openedx-events==0.7.1
# via -r requirements/edx/base.in
openedx-filters==0.4.3
# via -r requirements/edx/base.in
ora2==3.8.2
# TODO: Backport https://github.com/openedx/edx-ora2/pull/1869 to Olive if it uses a lower version than 4.5.0.
ora2 @ git+https://github.com/open-craft/edx-ora2@agrendalath/bb-6151-nutmeg_backport
# via -r requirements/edx/base.in
packaging==21.3
# via
Expand Down Expand Up @@ -725,7 +728,7 @@ psutil==5.9.0
# via
# -r requirements/edx/paver.txt
# edx-django-utils
py2neo==2021.2.3
py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.in
Expand Down Expand Up @@ -855,6 +858,7 @@ regex==2022.1.18
requests==2.27.1
# via
# -r requirements/edx/paver.txt
# algoliasearch
# analytics-python
# coreapi
# django-oauth-toolkit
Expand Down
5 changes: 5 additions & 0 deletions requirements/test-master.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
#
# make upgrade
#
algoliasearch==2.6.3
# via
# -c requirements/edx-platform-constraints.txt
# -r requirements/base.in
amqp==5.0.9
# via kombu
aniso8601==9.0.1
Expand Down Expand Up @@ -281,6 +285,7 @@ requests==2.27.1
# via
# -c requirements/edx-platform-constraints.txt
# -r requirements/base.in
# algoliasearch
# edx-drf-extensions
# edx-rest-api-client
# pyjwkest
Expand Down
3 changes: 3 additions & 0 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#
# make upgrade
#
algoliasearch==2.6.3
# via -r requirements/test-master.txt
# via
# -r requirements/test-master.txt
# kombu
Expand Down Expand Up @@ -287,6 +289,7 @@ pyyaml==6.0
requests==2.27.1
# via
# -r requirements/test-master.txt
# algoliasearch
# edx-drf-extensions
# edx-rest-api-client
# pyjwkest
Expand Down

0 comments on commit e74f608

Please sign in to comment.