Skip to content

Commit

Permalink
Partially revert Python 2.7 removal
Browse files Browse the repository at this point in the history
This partially reverts commit 1bd49cf.
Since I modified the templates which `tox -e bootstrap` uses, I couldn't
trust the generated files anymore. So I reverted my changes and
re-generated the files. The only change I left in was the removal of
Python 2.7 from `setup.py` as it seems that this file doesn't get
touched by tox.
  • Loading branch information
gnn committed Nov 22, 2018
1 parent aa11238 commit e497d93
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ environment:
WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
matrix:
- TOXENV: check
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
TOXPYTHON: C:\Python27\python.exe
PYTHON_HOME: C:\Python27
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '32'
- TOXENV: 'py34-cover,report,codecov'
TOXPYTHON: C:\Python34\python.exe
Expand Down
4 changes: 4 additions & 0 deletions ci/appveyor-bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
GET_PIP_URL = "https://bootstrap.pypa.io/get-pip.py"
GET_PIP_PATH = "C:\get-pip.py"
URLS = {
("2.7", "64"): BASE_URL + "2.7.13/python-2.7.13.amd64.msi",
("2.7", "32"): BASE_URL + "2.7.13/python-2.7.13.msi",
("3.4", "64"): BASE_URL + "3.4.4/python-3.4.4.amd64.msi",
("3.4", "32"): BASE_URL + "3.4.4/python-3.4.4.msi",
("3.5", "64"): BASE_URL + "3.5.4/python-3.5.4-amd64.exe",
Expand All @@ -27,6 +29,8 @@
}
INSTALL_CMD = {
# Commands are allowed to fail only if they are not the last command. Eg: uninstall (/x) allowed to fail.
"2.7": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
"3.4": [["msiexec.exe", "/L*+!", "install.log", "/qn", "/x", "{path}"],
["msiexec.exe", "/L*+!", "install.log", "/qn", "/i", "{path}", "TARGETDIR={home}"]],
"3.5": [["{path}", "/quiet", "TargetDir={home}"]],
Expand Down
6 changes: 3 additions & 3 deletions ci/templates/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ environment:
WITH_COMPILER: 'cmd /E:ON /V:ON /C .\ci\appveyor-with-compiler.cmd'
matrix:
- TOXENV: check
TOXPYTHON: C:\Python34\python.exe
PYTHON_HOME: C:\Python34
PYTHON_VERSION: '3.4'
TOXPYTHON: C:\Python27\python.exe
PYTHON_HOME: C:\Python27
PYTHON_VERSION: '2.7'
PYTHON_ARCH: '32'
{% for env, config in tox_environments|dictsort %}{{ '' }}{% if env.startswith(('py2', 'py3')) %}
- TOXENV: '{{ env }}{% if config.cover %},report,codecov{% endif %}'
Expand Down
2 changes: 1 addition & 1 deletion ci/templates/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ envlist =

[testenv]
basepython =
{docs,spell}: {env:TOXPYTHON:python3}
{docs,spell}: {env:TOXPYTHON:python2.7}
{bootstrap,clean,check,report,codecov,coveralls}: {env:TOXPYTHON:python3}
setenv =
PYTHONPATH={toxinidir}/tests
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ envlist =

[testenv]
basepython =
{docs,spell}: {env:TOXPYTHON:python3}
{docs,spell}: {env:TOXPYTHON:python2.7}
{bootstrap,clean,check,report,codecov,coveralls}: {env:TOXPYTHON:python3}
setenv =
PYTHONPATH={toxinidir}/tests
Expand Down

0 comments on commit e497d93

Please sign in to comment.