From: Aarni Koskela <akx@iki.fi>
Date: Fri, 19 Jan 2018 11:31:17 +0000 (+0200)
Subject: Update py.test
X-Git-Tag: v2.6.0~9^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7bfa3a51a20ddb9dd78e9587095a7986bfc716fb;p=thirdparty%2Fbabel.git

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 2dfbdd88..816b938f 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 d8f8bc16..e15875ba 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 b819e3e5..63dcd3ec 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 d5f180a2..4e877a36 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 33d1ab89..925ea7fe 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