diff --git a/.github/workflows/ci-testing.yaml b/.github/workflows/ci-testing.yaml index 8ebd8c3..565dd2f 100644 --- a/.github/workflows/ci-testing.yaml +++ b/.github/workflows/ci-testing.yaml @@ -14,7 +14,7 @@ # - Download the Python package from the previous job # - Install the downloaded Python package # - Test the code base -# - Check if Jupiter Notebooks run without errors +# - Check if Jupyter Notebooks run without errors name: Test code, notebooks and package @@ -251,7 +251,7 @@ jobs: run: > pytest tests/ --color=yes -n auto - - name: Check if Jupiter Notebooks run without errors + - name: Check if Jupyter Notebooks run without errors shell: bash run: > pytest --nbmake examples/ --ignore-glob='examples/*emcee*' diff --git a/README.md b/README.md index acb8b76..19d69f6 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

- + - + - EasyCrystallography + EasyDiffraction

diff --git a/tools/linting_and_formatting.sh b/tools/linting_and_formatting.sh index 2fbbd93..bcdc114 100755 --- a/tools/linting_and_formatting.sh +++ b/tools/linting_and_formatting.sh @@ -5,7 +5,7 @@ echo "\033[0;33m:::::: Check and fix code formatting\033[0m" ruff format . echo "\033[0;33m:::::: Check and fix notebook formatting\033[0m" -nbqa ruff examples/ +nbqa ruff examples/ --fix echo "\033[0;33m:::::: Check and fix non-code formatting\033[0m" npx prettier . --write --config=prettierrc.toml diff --git a/tools/run_notebooks.sh b/tools/run_notebooks.sh new file mode 100755 index 0000000..e6b0032 --- /dev/null +++ b/tools/run_notebooks.sh @@ -0,0 +1,6 @@ +echo "\033[0;33m:::::: Add src to pythonpath\033[0m" +export PYTHONPATH="${PWD}/src:${PYTHONPATH}" +echo "PYTHONPATH: ${PYTHONPATH}" + +echo "\033[0;33m:::::: Run Jupyter notebooks\033[0m" +pytest --nbmake examples/ --ignore-glob='examples/*emcee*' --nbmake-timeout=300 --color=yes -n=auto diff --git a/tools/run_tests.sh b/tools/run_tests.sh index 535e99e..82c745c 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -5,5 +5,8 @@ echo "PYTHONPATH: ${PYTHONPATH}" echo "\033[0;33m:::::: Run unit tests\033[0m" pytest tests/unit_tests/ --color=yes --disable-warnings +echo "\033[0;33m:::::: Run functional tests\033[0m" +pytest tests/functional_tests/ --color=yes --disable-warnings + echo "\033[0;33m:::::: Run integration tests\033[0m" pytest tests/integration_tests/ --color=yes --disable-warnings