mirror of
https://github.com/pyscript/pyscript.git
synced 2026-02-13 07:01:00 -05:00
f3157b377f
This PR tries to improve and rationalize what we log. Key points:
- introduce `logger.ts`: each file/component is encouraged to use the logger instead of writing directly to `console.*`
* the logger automatically prepend a prefix like `[py-config]`, `[py-env]` which make it easier to understand where a certain message is printed from
* it provide a central place where to add more features in the future. E.g., I can imagine having a config setting to completely silence the logs (not implemented yet)
- use the new loggers everywhere
- write to `.info()` instead of `.log()`. The idea is to keep `console.log` free, so that for the users it's easier to tell apart their own messages and the pyscript ones
- generally improve what we log. This is an endless exercise, but I tried to print more things which are useful to understand what's going on and in which order the various things are executed, and remove prints which were clearly debugging leftovers
121 lines
3.0 KiB
Makefile
121 lines
3.0 KiB
Makefile
tag := latest
|
|
git_hash ?= $(shell git log -1 --pretty=format:%h)
|
|
|
|
base_dir ?= $(shell git rev-parse --show-toplevel)
|
|
src_dir ?= $(base_dir)/pyscriptjs/src
|
|
examples ?= ../$(base_dir)/examples
|
|
app_dir ?= $(shell git rev-parse --show-prefix)
|
|
|
|
CONDA_EXE := conda
|
|
CONDA_ENV ?= $(base_dir)/pyscriptjs/env
|
|
env := $(CONDA_ENV)
|
|
conda_run := $(CONDA_EXE) run -p $(env)
|
|
PYTEST_EXE := $(CONDA_ENV)/bin/pytest
|
|
GOOD_NODE_VER := 14
|
|
GOOD_NPM_VER := 6
|
|
NODE_VER := $(shell node -v | cut -d. -f1 | sed 's/^v\(.*\)/\1/')
|
|
NPM_VER := $(shell npm -v | cut -d. -f1)
|
|
|
|
ifeq ($(shell uname -s), Darwin)
|
|
SED_I_ARG := -i ''
|
|
else
|
|
SED_I_ARG := -i
|
|
endif
|
|
|
|
GOOD_NODE := $(shell if [ $(NODE_VER) -ge $(GOOD_NODE_VER) ]; then echo true; else echo false; fi)
|
|
GOOD_NPM := $(shell if [ $(NPM_VER) -ge $(GOOD_NPM_VER) ]; then echo true; else echo false; fi)
|
|
|
|
.PHONY: check-node
|
|
check-node:
|
|
@echo Build requires Node $(GOOD_NODE_VER).x or higher: $(NODE_VER) detected && $(GOOD_NODE)
|
|
|
|
.PHONY: check-npm
|
|
check-npm:
|
|
@echo Build requires npm $(GOOD_NPM_VER).x or higher: $(NPM_VER) detected && $(GOOD_NPM)
|
|
|
|
setup:
|
|
make check-node
|
|
make check-npm
|
|
npm install
|
|
$(CONDA_EXE) env $(shell [ -d $(env) ] && echo update || echo create) -p $(env) --file environment.yml
|
|
$(conda_run) playwright install
|
|
$(CONDA_EXE) install -c anaconda pytest -y
|
|
|
|
clean:
|
|
find . -name \*.py[cod] -delete
|
|
rm -rf .pytest_cache .coverage coverage.xml
|
|
|
|
clean-all: clean
|
|
rm -rf $(env) *.egg-info
|
|
|
|
shell:
|
|
@export CONDA_ENV_PROMPT='<{name}>'
|
|
@echo 'conda activate $(env)'
|
|
|
|
dev:
|
|
npm run dev
|
|
|
|
build:
|
|
npm run build
|
|
|
|
examples:
|
|
mkdir -p ./examples
|
|
cp -r ../examples/* ./examples
|
|
chmod -R 755 examples
|
|
find ./examples/toga -type f -name '*.html' -exec sed $(SED_I_ARG) s+https://pyscript.net/latest/+../../build/+g {} \;
|
|
find ./examples/webgl -type f -name '*.html' -exec sed $(SED_I_ARG) s+https://pyscript.net/latest/+../../../build/+g {} \;
|
|
find ./examples -type f -name '*.html' -exec sed $(SED_I_ARG) s+https://pyscript.net/latest/+../build/+g {} \;
|
|
npm run build
|
|
cp -R ./build/ ./examples/build
|
|
@echo "To serve examples run: $(conda_run) python -m http.server 8080 --directory examples"
|
|
|
|
# run prerequisites and serve pyscript examples at http://localhost:8000/examples/
|
|
run-examples: setup build examples
|
|
make examples
|
|
npm install
|
|
make dev
|
|
|
|
test:
|
|
make examples
|
|
make test-ts
|
|
make test-py
|
|
|
|
test-integration:
|
|
make examples
|
|
$(PYTEST_EXE) -vv $(ARGS) tests/integration/ --log-cli-level=warning
|
|
|
|
test-py:
|
|
@echo "Tests from $(src_dir)"
|
|
$(PYTEST_EXE) -vv $(ARGS) tests/py-unit/ --log-cli-level=warning
|
|
|
|
test-ts:
|
|
@echo "Tests are coming :( this is a placeholder and it's meant to fail!"
|
|
npm run test
|
|
|
|
fmt: fmt-py fmt-ts
|
|
@echo "Format completed"
|
|
|
|
fmt-check: fmt-ts-check fmt-py-check
|
|
@echo "Format check completed"
|
|
|
|
fmt-ts:
|
|
npm run format
|
|
|
|
fmt-ts-check:
|
|
npm run format:check
|
|
|
|
fmt-py:
|
|
$(conda_run) black --skip-string-normalization .
|
|
$(conda_run) isort --profile black .
|
|
|
|
fmt-py-check:
|
|
$(conda_run) black -l 88 --check .
|
|
|
|
lint: lint-ts
|
|
@echo "Format check completed"
|
|
|
|
lint-ts:
|
|
$(conda_run) npm run lint
|
|
|
|
.PHONY: $(MAKECMDGOALS)
|