Skip to content

Commit

Permalink
Merge 29b9144 into a05249b
Browse files Browse the repository at this point in the history
  • Loading branch information
espdev committed Jun 11, 2020
2 parents a05249b + 29b9144 commit 675a31e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 22 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -9,7 +9,8 @@ matrix:
env: TOXENV=py37-pytest-coverage
- python: "3.8"
env: TOXENV=py38-pytest

- python: "3.7"
env: TOXENV=docs
- python: "3.7"
env: TOXENV=flake8

Expand Down
2 changes: 1 addition & 1 deletion csaps/_version.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-

__version__ = '0.11.0'
__version__ = '0.12.0dev'
12 changes: 2 additions & 10 deletions setup.py
Expand Up @@ -33,16 +33,8 @@ def _get_long_description():
'scipy >=1.0.0, <1.6.0',
],
extras_require={
'docs': [
'sphinx >=2.3',
'matplotlib >=3.1',
'numpydoc',
'm2r',
],
'tests': [
'pytest',
'coverage',
],
'docs': ['sphinx >=2.3, <3', 'matplotlib >=3.1', 'numpydoc', 'm2r'],
'tests': ['pytest', 'coverage <6', 'pytest-cov', 'coveralls'],
},
package_data={"csaps": ["py.typed"]},
url='https://github.com/espdev/csaps',
Expand Down
23 changes: 13 additions & 10 deletions tox.ini
@@ -1,22 +1,25 @@
[tox]
envlist = py{36,37,38}-pytest-coverage, flake8
envlist = py{36,37,38}-pytest-coverage, docs, flake8
skipsdist = True

[testenv]
deps = pytest
commands = pytest --color=yes {posargs}
commands =
pip install -e .[tests]
pytest -v --color=yes {posargs}

[testenv:py37-pytest-coverage]
usedevelop = true
passenv = TRAVIS TRAVIS_*
deps =
pytest
coverage <6
pytest-cov
coveralls
commands =
pytest --cov=csaps --color=yes {posargs}
pip install -e .[tests]
pytest -v --color=yes --cov=csaps {posargs}
coveralls

[testenv:docs]
whitelist_externals = make
commands =
pip install -e .[docs]
make -C docs/ html

[testenv:flake8]
deps =
flake8
Expand Down

0 comments on commit 675a31e

Please sign in to comment.