Merge branch 'main' into avm99963-monorail
Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e
GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/Makefile b/Makefile
index 57cf679..ac8c92a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
PRODID= avm99963-bugs
GAE_PY?= python gae.py
-DEV_APPSERVER_FLAGS?= --watcher_ignore_re="(.*/lib|.*/node_modules|.*/third_party|.*/venv)"
+DEV_APPSERVER_FLAGS?= --watcher_ignore_re="(.*/lib|.*/node_modules|.*/venv)"
WEBPACK_PATH := ./node_modules/webpack-cli/bin/cli.js
@@ -27,7 +27,6 @@
_VERSION ?= $(shell ../../../infra/luci/appengine/components/tools/calculate_version.py)
RUN_CLOUD_TASKS := ../../cipd/cloud-tasks-emulator \
- --queue projects/monorail-staging/locations/us-central1/queues/componentexport \
--queue projects/monorail-staging/locations/us-central1/queues/default \
--queue projects/monorail-staging/locations/us-central1/queues/notifications \
--queue projects/monorail-staging/locations/us-central1/queues/outboundemail \
@@ -56,7 +55,7 @@
touch ../../ENV/lib/python2.7/site-packages/google/__init__.py
PYTHONPATH=../../ENV/lib/python2.7/site-packages \
PATH=../../luci/appengine/components/tools:$(PATH) \
- ../../cipd/protoc \
+ ../../cipd/bin/protoc \
--python_out=. --prpc-python_out=. api/api_proto/*.proto
cd ../../go/src/infra/monorailv2 && \
cproto -proto-path ../../../../appengine/monorail/ ../../../../appengine/monorail/api/api_proto/
@@ -98,7 +97,7 @@
# to impersonate monorail-staging in the local environment.
serve:
@echo "---[Starting SDK AppEngine Server]---"
- $(GAE_PY) devserver -A monorail-staging -- $(DEV_APPSERVER_FLAGS)\
+ $(GAE_PY) devserver -A monorail-staging -- $(DEV_APPSERVER_FLAGS) 2>&1 | grep -a -v 'AccessTokenRefreshError' | grep -a -v 'csp.do' \
& $(WEBPACK_PATH) --watch\
& $(RUN_CLOUD_TASKS)
@@ -139,6 +138,10 @@
dev_deps:
python -m pip install --no-deps -r requirements.dev.txt
+generate_requirements_txt:
+ vpython3 -m pip freeze > requirements.txt
+ printf "# This file is generated from the .vpython3 spec file.\n# Use \`make generate_requirements_txt\` to update.\n$$(cat requirements.txt)" > requirements.txt
+
karma:
npx karma start --debug --coverage