build: private.txt files weren't handled properly
The requirements/edx/private.txt file is for dev's own private package needs. There are two installation mechanisms in edx-platform, and neither handled the file properly: - `paver install_prereqs` had the wrong file name. The file was moved almost three years ago, and paver wasn't kept up. - `make requirements` used `private.*` which included private.in, which pip-sync balks at.
This commit is contained in:
committed by
Ned Batchelder
parent
02c46fc016
commit
981ecb675e
5
Makefile
5
Makefile
@@ -67,7 +67,9 @@ 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.*
|
||||
# The "$(wildcard..)" is to include private.txt if it exists, and make no mention
|
||||
# of it if it does not. Shell wildcarding can't do that with default options.
|
||||
pip-sync -q requirements/edx/development.txt $(wildcard requirements/edx/private.txt)
|
||||
|
||||
shell: ## launch a bash shell in a Docker container with all edx-platform dependencies installed
|
||||
docker run -it -e "NO_PYTHON_UNINSTALL=1" -e "PIP_INDEX_URL=https://pypi.python.org/simple" -e TERM \
|
||||
@@ -130,4 +132,3 @@ docker_push: docker_tag docker_auth ## push to docker hub
|
||||
docker push "openedx/edx-platform:${GITHUB_SHA}-newrelic"
|
||||
docker push 'openedx/edx-platform:latest-devstack'
|
||||
docker push "openedx/edx-platform:${GITHUB_SHA}-devstack"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user