Skip to content

Commit b34c717

Browse files
committed
update test envs
use pypy3 fix travis osx env cache pip on appveyor codecov on appveyor
1 parent 99c56ea commit b34c717

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
lines changed

.appveyor.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
environment:
22
global:
3-
TOXENV: py
3+
TOXENV: py,codecov
44

55
matrix:
6-
- PYTHON: C:\Python36
7-
- PYTHON: C:\Python27
6+
- PYTHON: C:\Python36-x64
7+
- PYTHON: C:\Python27-x64
88

99
init:
1010
- SET PATH=%PYTHON%;%PATH%
1111

1212
install:
13-
- python -m pip install -U pip setuptools wheel tox
13+
- python -m pip install -U tox
1414

1515
build: false
1616

@@ -21,3 +21,6 @@ branches:
2121
only:
2222
- master
2323
- /^.*-maintenance$/
24+
25+
cache:
26+
- '%LOCALAPPDATA%\pip\Cache'

.travis.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,30 @@ matrix:
1414
env: TOXENV=py,codecov
1515
- python: 2.7
1616
env: TOXENV=py,simplejson,devel,lowest,codecov
17-
- python: pypy
17+
- python: pypy3
1818
env: TOXENV=py,codecov
1919
- python: nightly
2020
env: TOXENV=py
2121
- os: osx
2222
language: generic
23-
env: TOXENV=py
23+
env: TOXENV=py3,py2,codecov
24+
cache:
25+
pip: false
26+
directories:
27+
- $HOME/Library/Caches/Homebrew
28+
- $HOME/Library/Caches/pip
2429
allow_failures:
30+
- python: pypy3
2531
- python: nightly
26-
env: TOXENV=py
2732
- os: osx
28-
language: generic
29-
env: TOXENV=py
3033
fast_finish: true
3134

3235
before_install:
33-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
34-
brew update;
35-
brew install python3 redis memcached;
36-
virtualenv -p python3 ~/py-env;
37-
. ~/py-env/bin/activate;
36+
- |
37+
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
38+
brew upgrade python
39+
brew install python@2;
40+
export PATH="/usr/local/opt/python/libexec/bin:${PATH}"
3841
fi
3942
4043
install:

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ commands =
6060
coverage html
6161

6262
[testenv:codecov]
63-
passenv = CI TRAVIS TRAVIS_*
63+
passenv = CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_*
6464
deps = codecov
6565
skip_install = true
6666
commands =

0 commit comments

Comments
 (0)