Merge pull request #741 from CEED/jed/python-test-docs

Fix python test docs

Author: jeremylt

.github/workflows/python-test-with-style.yml

@@ -30,9 +30,8 @@ jobs:
         make -j2
         export CEED_DIR=$PWD
         pip install .
-        cd tests/python
-        python setup-qfunctions.py build
-        pytest test-*.py --ceed /cpu/self/ref/serial -vv
+        cd python/tests
+        PYTHON=python3 make test TEST_OPTS="--ceed /cpu/self/ref/serial -vv"
         cd ../..
     - name: Python style
       env:

python/make-wheels.sh

@@ -14,7 +14,7 @@ done
 for PYBIN in /opt/python/cp3[6789]*/bin; do
     $PYBIN/pip install --user --upgrade -r requirements-test.txt
     $PYBIN/pip install --user libceed --no-index --find-links wheelhouse/
-    pushd tests/python
+    pushd python/tests
     $PYBIN/python setup-qfunctions.py build
     $PYBIN/python -m pytest test-*.py --ceed /cpu/self/opt/blocked -vv
     popd

tests/python/.gitignore python/tests/.gitignoretests/python/.gitignore renamed to python/tests/.gitignore

@@ -17,4 +17,11 @@
 clean:
 	rm -rf build __pycache__ .pytest_cache *.so
 
-.PHONY: cln clean
+setup:
+	$(PYTHON) setup-qfunctions.py build
+
+TEST_OPTS ?= --ceed /cpu/self/ref/serial
+test: setup
+	$(PYTHON) -m pytest test-*.py $(TEST_OPTS)
+
+.PHONY: clean setup test

tests/python/Makefile python/tests/Makefiletests/python/Makefile renamed to python/tests/Makefile

@@ -1,7 +1,7 @@
 # libCEED Python Tests
 
 These files provide libCEED for Python tests. Full examples of finite element
-operators can be found in the file `test-ceed-operator.py`.
+operators can be found in the file `test-5-operator.py`.
 
 ## Testing
 
@@ -11,13 +11,13 @@ To run the tests, first build the user QFunctions file by running
 
 Then, to run the test suite use the command
 
-  pytest test-ceed*.py --ceed /cpu/self/ref/serial
+  pytest test-*.py --ceed /cpu/self/ref/serial
 
 ## Building QFunctions
 
 To build user defined QFunctions, modify `libceed-qfunctions.c` to include
 the apropriate QFunction single source file and run
-`python setup-qfunctions.py build`. The files `test-ceed-qfunction.py` and
-`test-ceed-operator.py` both contain the example function `load_qfs_so()` for
+`python setup-qfunctions.py build`. The files `test-4-qfunction.py` and
+`test-5-operator.py` both contain the example function `load_qfs_so()` for
 loading the user defined QFunctions so the QFunction pointers can be passed to
 libCEED.