Skip to content

Commit

Permalink
setup: setup.py test is deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Mar 10, 2021
1 parent 349c7d6 commit 79e4bb9
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml → .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ test_script:
- appveyor-retry pip install pytest
- appveyor-retry pip install coverage
- appveyor-retry pip install codecov
- coverage run --source=dclab ./setup.py test
- coverage run --source=dclab -m pytest tests
- coverage report -m
# Allow codecov to fail
- codecov || exit 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
pip freeze
- name: Test with pytest
run: |
coverage run --source=dclab setup.py test
coverage run --source=dclab -m pytest tests
- name: Lint with flake8
run: |
flake8 .
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
0.33.0
- feat: introduce user-defined temporary features (point 2 in #98)
- setup: remove deprecated setup.py test
0.32.5
- fix: add check for zero-flow rate in dclab-verify-dataset
- setup: added new file CREDITS for docs and only use maintainer
Expand Down
16 changes: 7 additions & 9 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,12 @@ once you are done making your changes.
Please make sure to edit the
`Changelog <https://github.com/ZELLMECHANIK-DRESDEN/dclab/blob/master/CHANGELOG>`__.

**Very important:** Please always try to use
**Very important:** Please always try to use ::

::

git pull --rebase

instead of

::
instead of::

git pull

Expand All @@ -58,17 +55,18 @@ to prevent confusions in the commit history.
Tests
~~~~~
dclab is tested using pytest. If you have the time, please write test
methods for your code and put them in the ``tests`` directory.
methods for your code and put them in the ``tests`` directory. To run
the tests, install `pytest` and run::

pytest tests


Incrementing version
~~~~~~~~~~~~~~~~~~~~
Dclab currently gets its version from the latest git tag.
If you think that a new version should be published,
create a tag on the master branch (if you have the necessary
permissions to do so):

::
permissions to do so)::

git tag -a "0.1.3"
git push --tags origin
Expand Down
3 changes: 0 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
[aliases]
test = pytest

[metadata]
license_file = LICENSE
2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@
),
],
# not to be confused with definitions in pyproject.toml [build-system]
setup_requires=["pytest-runner"],
python_requires=">=3.6",
tests_require=["pytest", "urllib3"] + extras_require["all"],
extras_require=extras_require,
entry_points={
"console_scripts": [
Expand Down

0 comments on commit 79e4bb9

Please sign in to comment.