diff --git a/.gitignore b/.gitignore index 71ae2dd8dff42538df54924cefdaaad26db1a5a8..6154122b4c2a11e8ed7f2869434313a6f9c33cda 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ _build .cache _local_tmp RELEASE-VERSION +test-report diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0bf291f78dc8310679a82b4b103998fe8226e59..b76595e724da36e68aab389a2f15365c676cb854 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ tests-and-coverage: - mkdir -p ~/.config/matplotlib - echo "backend:template" > ~/.config/matplotlib/matplotlibrc - mkdir public - - py.test -v -n $NUM_CORES --cov-report html --cov-report term --cov=. -m "not longrun" + - py.test -v -n $NUM_CORES --cov-report html --cov-report term --cov=. -m "not longrun" --html test-report/index.html tags: - docker - cuda @@ -26,6 +26,7 @@ tests-and-coverage: when: always paths: - coverage_report + - test-report # Nightly test - runs "long run" jobs only test-longrun: @@ -38,7 +39,7 @@ test-longrun: - export NUM_CORES=$(nproc --all) - mkdir -p ~/.config/matplotlib - echo "backend:template" > ~/.config/matplotlib/matplotlibrc - - py.test -v -n $NUM_CORES --cov-report html --cov-report term --cov=. + - py.test -v -n $NUM_CORES --cov-report html --cov-report term --cov=. --html test-report/index.html tags: - docker - cuda @@ -46,6 +47,7 @@ test-longrun: artifacts: paths: - coverage_report + - test-report # Minimal tests in windows environment minimal-windows: diff --git a/setup.py b/setup.py index 9fa7d47d814b31b68018b0b5d45c4a861df2b03c..83a76f870f02f64d8a371f294c1224c15c919061 100644 --- a/setup.py +++ b/setup.py @@ -117,7 +117,16 @@ setup(name='pystencils', 'doc': ['sphinx', 'sphinx_rtd_theme', 'nbsphinx', 'sphinxcontrib-bibtex', 'sphinx_autodoc_typehints', 'pandoc'], }, - tests_require=['pytest', 'pytest-cov', 'pytest-xdist', 'flake8', 'nbformat', 'nbconvert', 'ipython'], + tests_require=['pytest', + 'pytest-cov', + 'pytest-html', + 'ansi2html', + 'pytest-xdist', + 'flake8', + 'nbformat', + 'nbconvert', + 'ipython'], + python_requires=">=3.6", cmdclass={ 'quicktest': SimpleTestRunner