Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commite1d9a5b

Browse files
committed
Big tox/Travis CI update to make both test the same set of things.
Oh, and this adds PyPy3, while we're at it.In short: we now test both with and without optional packages in toxand fix Travis CI to test with optional packages under PyPy.
1 parent9ee8a1a commite1d9a5b

File tree

3 files changed

+14
-27
lines changed

3 files changed

+14
-27
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ python:
77
-"3.4"
88
-"3.5"
99
-"pypy"
10+
-"pypy3"
11+
1012
sudo:false
1113

1214
cache:

‎requirements-install.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ fi
77

88
pip install -r requirements-test.txt
99

10-
if [[$USE_OPTIONAL=="true"&&$TRAVIS_PYTHON_VERSION!="pypy" ]];then
11-
if [[$TRAVIS_PYTHON_VERSION=="2.6" ]];then
12-
pip install --allow-external Genshi --allow-insecure Genshi -r requirements-optional-2.6.txt
10+
if [[$USE_OPTIONAL=="true" ]];then
11+
if [[$TRAVIS_PYTHON_VERSION=="pypy"||$TRAVIS_PYTHON_VERSION=="pypy3" ]];then
12+
pip install -r requirements-optional.txt
13+
elif [[$TRAVIS_PYTHON_VERSION=="2.6" ]];then
14+
pip install -r requirements-optional-2.6.txt
1315
else
14-
pip install --allow-external Genshi --allow-insecure Genshi -r requirements-optional-cpython.txt
16+
pip install -r requirements-optional-cpython.txt
1517
fi
1618
fi

‎tox.ini‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,16 @@
11
[tox]
2-
envlist = py26,py27,py32,py33,py34,py35,pypy
2+
envlist ={py26,py27,py32,py33,py34,py35,pypy,pypy3}-{base,optional}
33

44
[testenv]
55
deps =
6-
-r{toxinidir}/requirements-optional-cpython.txt
76
flake8
87
nose
98
mock
9+
py26-base: ordereddict
10+
py26-optional: -r{toxinidir}/requirements-optional-2.6.txt
11+
{py27,py32,py33,py34,py35}-optional: -r{toxinidir}/requirements-optional-cpython.txt
12+
{pypy,pypy3}-optional: -r{toxinidir}/requirements-optional.txt
13+
1014
commands =
1115
{envbindir}/nosetests -q
1216
{toxinidir}/flake8-run.sh
13-
install_command =
14-
pip install {opts} {packages}
15-
16-
[testenv:pypy]
17-
# lxml doesn't work and datrie doesn't make sense
18-
# (it's slower than the pure-python version)
19-
deps =
20-
charade
21-
flake8
22-
Genshi
23-
nose
24-
six
25-
mock
26-
27-
[testenv:py26]
28-
basepython = python2.6
29-
deps =
30-
-r{toxinidir}/requirements-optional-2.6.txt
31-
flake8
32-
nose
33-
mock

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp