Update py.test

* Add py.test's .cache to ignore
* setup.cfg: Use [tool:pytest] instead of deprecated [pytest]

diff --git a/.ci/appveyor.yml b/.ci/appveyor.yml
index 2dfbdd884cba4dc782304803621e5336c7214615..816b938f65a56869cd29862765d98fcaf0a6e93e 100644 (file)
--- 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 d8f8bc164274c763f8176bf21e3c004151b79626..e15875ba034afcffd6a036b35852e3321e0e0d1c 100644 (file)
--- 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 b819e3e5eb6b5e2e62297130ff418af67e305949..63dcd3ec04b8ddaa7931fee74c909f7287190f46 100644 (file)
--- 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 d5f180a24d1e9e521741d24adf29a1f2773ce4f3..4e877a36fe780bad82c79da30326530ae6707def 100644 (file)
--- 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 33d1ab8903bbae3e631f5233d53a802b5a56ccbf..925ea7fe0a22c7e31e39afb1866af5e4148ccbfb 100644 (file)
--- 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