Ever changing "standards"

Author: rocky

Makefile

@@ -11,8 +11,8 @@ check: test
 
 #: Run tests
 test:
-	py.test pytest
-	py.test test/test_all.py
+	pytest pytest
+	pytest test/test_all.py
 
 clean:
 	cd test && make clean

admin-tools/merge-for-3.6.sh

@@ -3,7 +3,7 @@ xasm_merge_36_owd=$(pwd)
 PYTHON_VERSION=3.6
 pyenv local $PYTHON_VERSION
 cd $(dirname ${BASH_SOURCE[0]})
-if . ./setup-python-3.8.sh; then
+if . ./setup-python-3.6.sh; then
     git merge master
 fi
 cd $xasm_merge_36_owd