Skip to content

[BD-21] Move waffle_utils from edx-platform to edx-toggles #25286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robrap merged 10 commits into from
Oct 30, 2020
Merged

[BD-21] Move waffle_utils from edx-platform to edx-toggles #25286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
14cb7b6
Add a make target to compile requirements (without upgrade)
regisb Oct 5, 2020
24cf054
[BD-21] Migrate WaffleSwitch to edx-toggles
regisb Oct 5, 2020
474da0c
Refactor WaffleFlag and WaffleFlagNamespace internal API
regisb Oct 7, 2020
5804372
[BD-21] Migrate waffle flag classes to edx-toggles
regisb Oct 12, 2020
db5feec
Move waffle_utils/testutils.py to edx-toggles
regisb Oct 13, 2020
e5500b3
Backport override features from edx-toggles to waffle_utils
regisb Oct 13, 2020
98ffa34
Fix waffle_utils unit tests
regisb Oct 13, 2020
a274998
Add deprecation warning comments to waffle_utils code
regisb Oct 14, 2020
373ee5f
Ensure compatibility with edx-toggles despite upcoming breaking changes
regisb Oct 23, 2020
312f0cd
Fix error in toggle state endpoint in the absence of module_name
regisb Oct 29, 2020
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
16 changes: 10 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ detect_changed_source_translations: ## check if translation files are up-to-date
pull: ## update the Docker image used by "make shell"
docker pull edxops/edxapp:latest

requirements: ## install development environment requirements
pre-requirements: ## install Python requirements for running pip-tools
pip install -qr requirements/edx/pip-tools.txt

requirements: pre-requirements ## install development environment requirements
pip-sync -q requirements/edx/development.txt requirements/edx/private.*

shell: ## launch a bash shell in a Docker container with all edx-platform dependencies installed
Expand All @@ -87,15 +89,14 @@ REQ_FILES = \
requirements/edx/development \
scripts/xblock/requirements

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the pip requirements files to use the latest releases satisfying our constraints
pip install -qr requirements/edx/pip-tools.txt
compile-requirements: export CUSTOM_COMPILE_COMMAND=make upgrade
compile-requirements: ## Re-compile *.in requirements to *.txt
Comment thread
robrap marked this conversation as resolved.
Outdated
@ export REBUILD='--rebuild'; \
for f in $(REQ_FILES); do \
echo ; \
echo "== $$f ===============================" ; \
echo "pip-compile -v --no-emit-trusted-host --no-index $$REBUILD --upgrade -o $$f.txt $$f.in"; \
pip-compile -v --no-emit-trusted-host --no-index $$REBUILD --upgrade -o $$f.txt $$f.in || exit 1; \
echo "pip-compile -v --no-emit-trusted-host --no-index $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in"; \
pip-compile -v --no-emit-trusted-host --no-index $$REBUILD ${COMPILE_OPTS} -o $$f.txt $$f.in || exit 1; \
export REBUILD=''; \
done
# Post process all of the files generated above to work around open pip-tools issues
Expand All @@ -105,6 +106,9 @@ upgrade: ## update the pip requirements files to use the latest releases satisfy
sed '/^[dD]jango==/d' requirements/edx/testing.txt > requirements/edx/testing.tmp
mv requirements/edx/testing.tmp requirements/edx/testing.txt

upgrade: pre-requirements ## update the pip requirements files to use the latest releases satisfying our constraints
$(MAKE) compile-requirements COMPILE_OPTS="--upgrade"

# These make targets currently only build LMS images.
docker_build:
docker build . -f Dockerfile --target lms -t openedx/edx-platform
Expand Down
Loading