diff --git a/makefile b/makefile --- a/makefile +++ b/makefile @@ -60,25 +60,12 @@ setup: packages gst_packages pnpm js py deps: js py - -tkdnd_build: - # get tkdnd r95 with subversion - # then apply tkdnd-patch-on-r95 to that - cd tkdnd/trunk - ./configure - make - push_github: hg bookmark -r default main && hg push git+ssh://git@github.com/drewp/light9.git pull_github: hg pull git+ssh://git@github.com/drewp/light9.git -### build ### - -coffee: - zsh -c 'cd light9/web; ../../node_modules/coffeescript/bin/coffee --map -cw {.,live,timeline,paint,effects}/*.coffee' - ### show ### qlc_artnet_dmx_proxy: @@ -113,17 +100,11 @@ arduino_upload: /usr/share/arduino/Ardui ### testing ### -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 pdm run nosetests -x $(NOSEARGS) +pytest: + pdm run pytest -tests_watch: - eval pdm run nosetests --with-watcher $(NOSEARGS) - - -tests_coverage: - eval pdm run nosetests --with-coverage --cover-erase --cover-html --cover-html-dir=/tmp/light9-cov/ --cover-package=light9 --cover-branches $(NOSEARGS) +pytest_watch: + pdm run ptw test_js_init: npm install