summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAarni Koskela <akx@iki.fi>2018-01-19 13:31:17 +0200
committerAarni Koskela <akx@iki.fi>2018-01-19 14:33:57 +0200
commit7bfa3a51a20ddb9dd78e9587095a7986bfc716fb (patch)
treec7bf9d7dba8acb59325d1e666639c30476e7cd5a
parentd72eb13d027ae9f8813c335974a6c2198320161f (diff)
downloadbabel-7bfa3a51a20ddb9dd78e9587095a7986bfc716fb.tar.gz
Update py.test
* Add py.test's .cache to ignore * setup.cfg: Use [tool:pytest] instead of deprecated [pytest]
-rw-r--r--.ci/appveyor.yml2
-rw-r--r--.gitignore3
-rw-r--r--.travis.yml2
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini3
5 files changed, 7 insertions, 5 deletions
diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index 2dfbdd8..816b938 100644
--- a/.ci/appveyor.yml
+++ b/.ci/appveyor.yml
@@ -27,7 +27,7 @@ install:
- "python --version"
- "python -c \"import struct; print(struct.calcsize('P') * 8)\""
# Build data files
- - "pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 codecov freezegun==0.3.9"
+ - "pip install --upgrade pytest==3.3.2 pytest-cov==2.5.1 codecov freezegun==0.3.9"
- "pip install --editable ."
- "python setup.py import_cldr"
diff --git a/.gitignore b/.gitignore
index d8f8bc1..e15875b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ build
dist
.DS_Store
.tox
+.cache
test-env
**/__pycache__
babel/global.dat
@@ -18,4 +19,4 @@ babel/global.dat.json
tests/messages/data/project/i18n/long_messages.pot
tests/messages/data/project/i18n/temp*
tests/messages/data/project/i18n/en_US
-/venv*
+/venv* \ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index b819e3e..63dcd3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ matrix:
install:
- bash .ci/deps.${TRAVIS_OS_NAME}.sh
- pip install --upgrade pip
- - pip install --upgrade pytest==2.8.5 pytest-cov==2.2.0 $CDECIMAL freezegun==0.3.9
+ - pip install --upgrade $CDECIMAL pytest==3.3.2 pytest-cov==2.5.1 freezegun==0.3.9
- pip install --editable .
script:
diff --git a/setup.cfg b/setup.cfg
index d5f180a..4e877a3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
[aliases]
release = sdist bdist_wheel
-[pytest]
+[tool:pytest]
norecursedirs = venv* .* _* scripts {args}
doctest_optionflags = ELLIPSIS NORMALIZE_WHITESPACE ALLOW_UNICODE IGNORE_EXCEPTION_DETAIL
diff --git a/tox.ini b/tox.ini
index 33d1ab8..925ea7f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,8 @@ envlist = py27, pypy, py34, py35, py36, pypy3, py27-cdecimal
[testenv]
deps =
- pytest
+ pytest==3.3.2
+ pytest-cov==2.5.1
cdecimal: m3-cdecimal
freezegun
whitelist_externals = make