Skip to content

Commit 775a141

Browse files
committed
Update envs to include 3.5.
1 parent 299736e commit 775a141

File tree

5 files changed

+60
-9
lines changed

5 files changed

+60
-9
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ env:
1414
- TOXENV=3.3-nocover
1515
- TOXENV=3.4,extension-coveralls,coveralls,codecov
1616
- TOXENV=3.4-nocover
17+
- TOXENV=3.5,extension-coveralls,coveralls,codecov
18+
- TOXENV=3.5-nocover
1719
- TOXENV=pypy,extension-coveralls,coveralls,codecov
1820
- TOXENV=pypy-nocover
1921
before_install:

appveyor.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,30 @@ environment:
8080
PYTHON_HOME: "C:\\Python34-x64"
8181
PYTHON_VERSION: "3.4"
8282
PYTHON_ARCH: "64"
83+
- TOXENV: "3.5"
84+
TOXPYTHON: "C:\\Python35\\python.exe"
85+
WINDOWS_SDK_VERSION: "v7.1"
86+
PYTHON_HOME: "C:\\Python35"
87+
PYTHON_VERSION: "3.5"
88+
PYTHON_ARCH: "32"
89+
- TOXENV: "3.5"
90+
TOXPYTHON: "C:\\Python35-x64\\python.exe"
91+
WINDOWS_SDK_VERSION: "v7.1"
92+
PYTHON_HOME: "C:\\Python35-x64"
93+
PYTHON_VERSION: "3.5"
94+
PYTHON_ARCH: "64"
95+
- TOXENV: "3.5-nocover"
96+
TOXPYTHON: "C:\\Python35\\python.exe"
97+
WINDOWS_SDK_VERSION: "v7.1"
98+
PYTHON_HOME: "C:\\Python35"
99+
PYTHON_VERSION: "3.5"
100+
PYTHON_ARCH: "32"
101+
- TOXENV: "3.5-nocover"
102+
TOXPYTHON: "C:\\Python35-x64\\python.exe"
103+
WINDOWS_SDK_VERSION: "v7.1"
104+
PYTHON_HOME: "C:\\Python35-x64"
105+
PYTHON_VERSION: "3.5"
106+
PYTHON_ARCH: "64"
83107
init:
84108
- "ECHO %TOXENV%"
85109
- ps: "ls C:\\Python*"

ci/templates/appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ environment:
88
PYTHON_HOME: "C:\\Python27"
99
PYTHON_VERSION: "2.7"
1010
PYTHON_ARCH: "32"
11-
{% for env, config in tox_environments|dictsort %}{% if env.startswith('2.7') or env.startswith('3.4') or env.startswith('3.3') %}
11+
{% for env, config in tox_environments|dictsort %}{% if env.startswith(('2.7', '3.3', '3.4', '3.5')) %}
1212
- TOXENV: "{{ env }}"
1313
TOXPYTHON: "C:\\Python{{ env[:3].replace('.', '') }}\\python.exe"
1414
WINDOWS_SDK_VERSION: "v7.{{ '1' if env[0] == '3' else '0' }}"

setup.cfg

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ exclude = tests/*,*/migrations/*,*/south_migrations/*
1717
[bumpversion:file:src/lazy_object_proxy/__init__.py]
1818

1919
[pytest]
20-
norecursedirs =
20+
norecursedirs =
2121
.git
2222
.tox
2323
.env
2424
dist
2525
build
2626
south_migrations
2727
migrations
28-
python_files =
28+
python_files =
2929
test_*.py
3030
*_test.py
3131
tests.py
32-
addopts =
32+
addopts =
3333
-rxEfs
3434
--strict
3535
--ignore=docs/conf.py
@@ -38,7 +38,8 @@ addopts =
3838
--doctest-modules
3939
--doctest-glob=\*.rst
4040
--tb=short
41-
markers =
41+
--assert=plain
42+
markers =
4243
xfail_subclass: Expected test to fail with a subclass of Proxy.
4344
xfail_simple: Expected test to fail on the `simple` implementation.
4445

@@ -50,18 +51,19 @@ default_section = THIRDPARTY
5051
forced_separate = test_lazy_object_proxy
5152

5253
[matrix]
53-
python_versions =
54+
python_versions =
5455
2.6
5556
2.7
5657
3.3
5758
3.4
59+
3.5
5860
pypy
59-
dependencies =
61+
dependencies =
6062
:Django !python_versions[2.6]
6163
: &python_versions[2.6]
62-
coverage_flags =
64+
coverage_flags =
6365
: true
6466
nocover: false
65-
environment_variables =
67+
environment_variables =
6668
-
6769

tox.ini

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ envlist =
1010
3.3-nocover,
1111
3.4,
1212
3.4-nocover,
13+
3.5,
14+
3.5-nocover,
1315
pypy,
1416
pypy-nocover,
1517
report,
@@ -193,6 +195,27 @@ deps =
193195
{[testenv]deps}
194196
Django
195197

198+
[testenv:3.5]
199+
basepython = {env:TOXPYTHON:python3.5}
200+
setenv =
201+
{[testenv]setenv}
202+
WITH_COVERAGE=yes
203+
CFLAGS=-coverage
204+
usedevelop = true
205+
commands =
206+
python setup.py clean --all build_ext --force --inplace
207+
{posargs:py.test --cov=src --cov-report=term-missing -vv}
208+
deps =
209+
{[testenv]deps}
210+
pytest-cover
211+
Django
212+
213+
[testenv:3.5-nocover]
214+
basepython = {env:TOXPYTHON:python3.5}
215+
deps =
216+
{[testenv]deps}
217+
Django
218+
196219
[testenv:pypy]
197220
basepython = {env:TOXPYTHON:pypy}
198221
setenv =

0 commit comments

Comments
 (0)