aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Ganssle <paul@ganssle.io>2017-11-01 14:02:48 -0400
committerPaul Ganssle <paul@ganssle.io>2017-11-05 10:21:27 -0500
commitaa46c73eafb9cfe36cdc0f6c5c5680edd6192c79 (patch)
tree0e5d74fa7a54d639314d4a2cc9ee5ddf28fcf26d
parent6a3f2167feb52c09e6ccd529542016c72372d5c4 (diff)
downloaddateutil-aa46c73eafb9cfe36cdc0f6c5c5680edd6192c79.tar.gz
Update test runner to use pytest
-rw-r--r--.travis.yml3
-rw-r--r--appveyor.yml4
-rw-r--r--setup.py2
-rw-r--r--tox.ini4
4 files changed, 8 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index df75f38..019b481 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,13 +21,14 @@ before_install:
- if [[ $TRAVIS_PYTHON_VERSION < '3.0' ]]; then pip install mock; fi
- pip install codecov
- pip install freezegun
+ - pip install pytest
install:
- pip install six
- ./ci_tools/retry.sh python updatezinfo.py
script:
- - coverage run --omit=setup.py,dateutil/test/* setup.py test
+ - coverage run --omit=setup.py,dateutil/test/* -m pytest
after_success:
- codecov
diff --git a/appveyor.yml b/appveyor.yml
index 60ed057..f60d632 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -23,6 +23,8 @@ install:
- "%pip_cmd% install six"
- "%pip_cmd% install coverage"
- "%pip_cmd% install codecov"
+ - "%pip_cmd% install pytest"
+ - "%pip_cmd% install freezegun"
# This frequently fails with network errors, so we'll retry it up to 5 times
# with a 1 minute rate limit.
@@ -30,6 +32,6 @@ install:
# This environment variable tells the test suite it's OK to mess with the time zone.
- set DATEUTIL_MAY_CHANGE_TZ=1
test_script:
- - "coverage run --omit=setup.py,dateutil/test/* setup.py test"
+ - "coverage run --omit=setup.py,dateutil/test/* -m pytest"
after_test:
- "codecov"
diff --git a/setup.py b/setup.py
index ce8497f..ff7d2f5 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ datetime module available in the Python standard library.
package_data={"dateutil.zoneinfo": ["dateutil-zoneinfo.tar.gz"]},
zip_safe=True,
requires=["six"],
- tests_require=["freezegun"],
+ tests_require=["freezegun", "pytest"],
install_requires=["six >=1.5"], # XXX fix when packaging is sane again
classifiers=[
'Development Status :: 5 - Production/Stable',
diff --git a/tox.ini b/tox.ini
index 4882750..45c9e19 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,6 @@ envlist =
pypy3
[testenv]
-commands = python setup.py test -q {posargs}
+commands = pytest {posargs}
deps =
- six
+ six,pytest,freezegun