diff --git a/makefile b/makefile --- a/makefile +++ b/makefile @@ -21,13 +21,13 @@ npm_install: pnpm install node_modules/n3/n3-browser.js: - (cd node_modules/n3; nodejs ../browserify/bin/cmd.js --standalone N3 --require n3 -o n3-browser.js) + (cd node_modules/n3; pnpx browserify --standalone N3 --require n3 -o n3-browser.js) light9/web/lib/debug/debug-build.js: - node_modules/browserify/bin/cmd.js light9/web/lib/debug/src/browser.js -o light9/web/lib/debug/debug-build.js --standalone debug + pnpx browserify light9/web/lib/debug/src/browser.js -o light9/web/lib/debug/debug-build.js --standalone debug light9/web/lib/debug/debug-build-es6.js: - node_modules/browserify/bin/cmd.js light9/web/lib/debug/src/browser.js -o light9/web/lib/debug/debug-build-es6.js --standalone debug + pnpx browserify light9/web/lib/debug/src/browser.js -o light9/web/lib/debug/debug-build-es6.js --standalone debug echo "\nexport default window.debug;" >> light9/web/lib/debug/debug-build-es6.js lit_fix: @@ -59,12 +59,6 @@ tkdnd_build: coffee: zsh -c 'cd light9/web; ../../node_modules/coffeescript/bin/coffee --map -cw {.,live,timeline,paint,effects}/*.coffee' -mypy: - inv mypy - -reformat: - inv reformat - ### show ### qlc_artnet_dmx_proxy: @@ -102,25 +96,25 @@ arduino_upload: /usr/share/arduino/Ardui NOSEARGS="--no-path-adjustment light9.rdfdb.rdflibpatch light9.rdfdb.patch light9.effecteval.test_effect light9.collector light9.rdfdb.graphfile_test light9.paint light9.effect" tests: - eval env/bin/nosetests -x $(NOSEARGS) + eval pdm run nosetests -x $(NOSEARGS) tests_watch: - eval env/bin/nosetests --with-watcher $(NOSEARGS) + eval pdm run nosetests --with-watcher $(NOSEARGS) tests_coverage: - eval env/bin/nosetests --with-coverage --cover-erase --cover-html --cover-html-dir=/tmp/light9-cov/ --cover-package=light9 --cover-branches $(NOSEARGS) + eval pdm run nosetests --with-coverage --cover-erase --cover-html --cover-html-dir=/tmp/light9-cov/ --cover-package=light9 --cover-branches $(NOSEARGS) test_js_init: npm install test_js: - node_modules/coffeescript/bin/coffee -c light9/web/*.coffee - node_modules/mocha/bin/mocha --compilers coffee:coffee-script/register --globals window,N3 light9/web/graph_test.coffee + pnpx coffee -c light9/web/*.coffee + pnpx mocha --compilers coffee:coffee-script/register --globals window,N3 light9/web/graph_test.coffee test_js_watch: # have coffee continuously running - watch -c node_modules/mocha/bin/mocha --compilers coffee:coffee-script/register --globals window,N3 light9/web/graph_test.coffee --colors + watch -c pnpx mocha --compilers coffee:coffee-script/register --globals window,N3 light9/web/graph_test.coffee --colors profile_seq: echo in lib, get https://github.com/uber/pyflame.git and https://github.com/brendangregg/FlameGraph.git