diff options
author | Aarni Koskela <akx@iki.fi> | 2018-01-19 13:31:17 +0200 |
---|---|---|
committer | Aarni Koskela <akx@iki.fi> | 2018-01-19 14:33:57 +0200 |
commit | 7bfa3a51a20ddb9dd78e9587095a7986bfc716fb (patch) | |
tree | c7bf9d7dba8acb59325d1e666639c30476e7cd5a | |
parent | d72eb13d027ae9f8813c335974a6c2198320161f (diff) | |
download | babel-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.yml | 2 | ||||
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | setup.cfg | 2 | ||||
-rw-r--r-- | tox.ini | 3 |
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" @@ -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: @@ -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 @@ -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 |