Skip to content

Commit c363534

Browse files
authored
Merge pull request #147 from uilianries/hotfix/python2
#146 Fix py2 support
2 parents 4f9fd80 + 552b440 commit c363534

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- stage: Linux - Conan develop
1010
name: Python 2.7
1111
python: 2.7
12-
env: TOXENV=py27-conandev
12+
env: TOXENV=py27-conandev USE_UNSUPPORTED_CONAN_WITH_PYTHON_2=1
1313
- name: Python 3.7
1414
python: 3.7
1515
env: TOXENV=py37-conandev

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ environment:
77
# Conan development
88
- PYVER: py27
99
TOXENV: py27-conandev
10+
USE_UNSUPPORTED_CONAN_WITH_PYTHON_2: 1
1011
- PYVER: py37
1112
TOXENV: py37-conandev
1213

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ setenv =
2121
coverage: COVERAGE_FILE={toxinidir}/.coverage
2222
coverage: PYTESTDJANGO_COVERAGE_SRC={toxinidir}/
2323

24-
passenv = PYTEST_ADDOPTS
24+
passenv = PYTEST_ADDOPTS USE_UNSUPPORTED_CONAN_WITH_PYTHON_2
2525

2626
commands =
2727
coverage: coverage erase

0 commit comments

Comments
 (0)