diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c60e69ca643d5e6844e45ade8f7f6845cb1dfb7..b8a029af43ffb62aca55e4cd53903b8660bded4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ cache: - venv/ before_script: + - apt-get update -y && apt-get install libgl1 -y - python -m pip install --upgrade pip - python --version # For debugging - pip install virtualenv @@ -30,9 +31,8 @@ stages: # List of stages for jobs, and their order of execution test: # This job runs in the build stage, which runs first. stage: test script: - - apt-get update -y && apt-get install libgl1 -y - pip install . - - pip install pytest + - pip install -r requirements_dev.txt - pytest tests/. lint-test-job: # This job also runs in the test stage. @@ -42,9 +42,23 @@ lint-test-job: # This job also runs in the test stage. - flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude='venv/' - flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude='venv/' +coverage: + stage: test + script: + - pip install . + - pip install -r requirements_dev.txt + - python -m pytest --cov=ntrfc tests + - coverage xml + coverage: '/TOTAL.*\s+(\d+\%)/' + artifacts: + paths: + - coverage.xml + when: always + #deploy-job: # This job runs in the deploy stage. # stage: deploy # It only runs when *both* jobs in the test stage complete successfully. # script: # - echo "Deploying application..." # - echo "Application successfully deployed." + diff --git a/README.rst b/README.rst index fb27bcf1dc5e7aa17a91058b2be4a8eed9038948..7b189dea260e5f264590f46ceec62926234cea32 100644 --- a/README.rst +++ b/README.rst @@ -3,17 +3,6 @@ NTRfC ===== -.. image:: https://img.shields.io/pypi/v/ntrfc.svg - :target: https://pypi.python.org/pypi/ntrfc - -.. image:: https://img.shields.io/travis/MaNyh/ntrfc.svg - :target: https://travis-ci.com/MaNyh/ntrfc - -.. image:: https://readthedocs.org/projects/ntrfc/badge/?version=latest - :target: https://ntrfc.readthedocs.io/en/latest/?version=latest - :alt: Documentation Status - - Numerical Test Rig for Cascades. diff --git a/requirements_dev.txt b/requirements_dev.txt index 0cfb56e4f07d07d5a102eb2143cc55f17009293f..f6a976654471943d2d18e3876cf18078090ac979 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1 +1,4 @@ pipreqs==0.4.11 +pytest==7.1.2 +pytest-cov +coverage diff --git a/setup.py b/setup.py index 91171cbe5a0c53742b6a2434183386eebe0c7d4d..b01d22529311aadbddf5c71c432b8432b1bc802f 100644 --- a/setup.py +++ b/setup.py @@ -20,16 +20,13 @@ setup( name='ntrfc', author="Malte Nyhuis", author_email='nyhuis@tfd.uni-hannover.de', - python_requires='>=3.6', + python_requires='>=3.10', classifiers=[ - 'Development Status :: 2 - Pre-Alpha', + 'Development Status :: 0.1.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.10', ], description="Numerical Test Rig for Cascades. A workflows-library for cfd-analysis of cascade-flows", entry_points={