Skip to content

Commit d81dde0

Browse files
author
Bastien Vallet
committed
[cleanup] Remove artefacts from old py34 support
1 parent a9ec661 commit d81dde0

File tree

9 files changed

+28
-28
lines changed

9 files changed

+28
-28
lines changed

CONTRIBUTORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Asmund Grammeltwedt
1414
Barney Gale
1515
Barry Warsaw
1616
Bartolome Sanchez Salado
17+
Bastien Vallet
1718
Benoit Pierre
1819
Bernat Gabor
1920
Brett Langdon

docs/drafts/tox_conda_notes_niccodemus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type=conda-env
3333

3434
1. Create a new ``create_env_command`` option.
3535
;2. Create a new ``env_activate_command`` option (also consider how to make that platform dependent).
36-
2. New substitution variable: {python_version} ('3.4', '2.7', etc')
36+
2. New substitution variable: {python_version} ('3.5', '2.7', etc')
3737
3. env type concept: different types change the default options.
3838

3939
1. tox_addoption can now add new "testenv" sections to tox.ini:

docs/example/basic.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,14 +359,14 @@ use :ref:`generative-envlist` and :ref:`conditional settings <factors>` to expre
359359
.. code-block:: ini
360360
361361
[tox]
362-
envlist = py{27,34,36}-django{15,16}-{sqlite,mysql}
362+
envlist = py{27,36,37}-django{22,30}-{sqlite,mysql}
363363
364364
[testenv]
365365
deps =
366-
django15: Django>=1.5,<1.6
367-
django16: Django>=1.6,<1.7
368-
# use PyMySQL if factors "py34" and "mysql" are present in env name
369-
py34-mysql: PyMySQL
366+
django22: Django>=2.2,<2.3
367+
django30: Django>=3.0,<3.1
368+
# use PyMySQL if factors "py37" and "mysql" are present in env name
369+
py37-mysql: PyMySQL
370370
# use urllib3 if any of "py36" or "py27" are present in env name
371371
py27,py36: urllib3
372372
# mocking sqlite on 2.7 and 3.6 if factor "sqlite" is present

docs/example/unittest.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ that looks like this:
4848
.. code-block:: ini
4949
5050
[tox]
51-
envlist = py27,py34,py35,py36
51+
envlist = py27,py35,py36,py37
5252
5353
[testenv]
5454
deps = unittest2
@@ -74,7 +74,7 @@ that looks like this:
7474
7575
mock uses unittest2_ to run the tests. Invoking ``tox`` starts test
7676
discovery by executing the ``unit2 discover``
77-
commands on Python 2.7, 3.4, 3.5 and 3.6 respectively. Against
77+
commands on Python 2.7, 3.5, 3.6 and 3.7 respectively. Against
7878
Python3.6 and Python2.7 it will additionally run sphinx-mediated
7979
doctests. If building the docs fails, due to a reST error, or
8080
any of the doctests fails, it will be reported by the tox run.

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Current features
139139
* uses pip_ and setuptools_ by default. Support for configuring the installer command
140140
through :conf:`install_command=ARGV`.
141141

142-
* **cross-Python compatible**: CPython-2.7, 3.4 and higher, Jython and pypy_.
142+
* **cross-Python compatible**: CPython-2.7, 3.5 and higher, Jython and pypy_.
143143

144144
* **cross-platform**: Windows and Unix style environments
145145

docs/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ tox installation
44
Install info in a nutshell
55
----------------------------------
66

7-
**Pythons**: CPython 2.7 and 3.4 or later, Jython-2.5.1, pypy-1.9ff
7+
**Pythons**: CPython 2.7 and 3.5 or later, Jython-2.5.1, pypy-1.9ff
88

99
**Operating systems**: Linux, Windows, OSX, Unix
1010

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ testing =
6262
flaky>=3.4.0
6363
freezegun>=0.3.11
6464
pathlib2>=2.3.3
65+
psutil>=5.6.1
6566
pytest>=4.0.0
6667
pytest-cov>=2.5.1
6768
pytest-mock>=1.10.0
6869
pytest-randomly>=1.0.0
6970
pytest-xdist>=1.22.2
70-
psutil>=5.6.1;python_version != "3.4"
7171

7272
[options.packages.find]
7373
where = src

tests/unit/session/test_list_env.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ def test_listenvs(cmd, initproj, monkeypatch):
55
filedefs={
66
"tox.ini": """
77
[tox]
8-
envlist=py36,py27,py34,pypi,docs
8+
envlist=py36,py27,py37,pypi,docs
99
description= py27: run pytest on Python 2.7
10-
py34: run pytest on Python 3.6
10+
py37: run pytest on Python 3.6
1111
pypi: publish to PyPI
1212
docs: document stuff
1313
notincluded: random extra
@@ -22,18 +22,18 @@ def test_listenvs(cmd, initproj, monkeypatch):
2222
)
2323

2424
result = cmd("-l")
25-
assert result.outlines == ["py36", "py27", "py34", "pypi", "docs"]
25+
assert result.outlines == ["py36", "py27", "py37", "pypi", "docs"]
2626

2727
result = cmd("-l", "-e", "py")
28-
assert result.outlines == ["py36", "py27", "py34", "pypi", "docs"]
28+
assert result.outlines == ["py36", "py27", "py37", "pypi", "docs"]
2929

3030
monkeypatch.setenv(str("TOXENV"), str("py"))
3131
result = cmd("-l")
32-
assert result.outlines == ["py36", "py27", "py34", "pypi", "docs"]
32+
assert result.outlines == ["py36", "py27", "py37", "pypi", "docs"]
3333

3434
monkeypatch.setenv(str("TOXENV"), str("py36"))
3535
result = cmd("-l")
36-
assert result.outlines == ["py36", "py27", "py34", "pypi", "docs"]
36+
assert result.outlines == ["py36", "py27", "py37", "pypi", "docs"]
3737

3838

3939
def test_listenvs_verbose_description(cmd, initproj):
@@ -42,11 +42,11 @@ def test_listenvs_verbose_description(cmd, initproj):
4242
filedefs={
4343
"tox.ini": """
4444
[tox]
45-
envlist=py36,py27,py34,pypi,docs
45+
envlist=py36,py27,py37,pypi,docs
4646
[testenv]
4747
description= py36: run pytest on Python 3.6
4848
py27: run pytest on Python 2.7
49-
py34: run pytest on Python 3.4
49+
py37: run pytest on Python 3.7
5050
pypi: publish to PyPI
5151
docs: document stuff
5252
notincluded: random extra
@@ -65,7 +65,7 @@ def test_listenvs_verbose_description(cmd, initproj):
6565
"default environments:",
6666
"py36 -> run pytest on Python 3.6",
6767
"py27 -> run pytest on Python 2.7",
68-
"py34 -> run pytest on Python 3.4",
68+
"py37 -> run pytest on Python 3.7",
6969
"pypi -> publish to PyPI",
7070
"docs -> let me overwrite that",
7171
]
@@ -78,7 +78,7 @@ def test_listenvs_all(cmd, initproj, monkeypatch):
7878
filedefs={
7979
"tox.ini": """
8080
[tox]
81-
envlist=py36,py27,py34,pypi,docs
81+
envlist=py36,py27,py37,pypi,docs
8282
8383
[testenv:notincluded]
8484
changedir = whatever
@@ -89,19 +89,19 @@ def test_listenvs_all(cmd, initproj, monkeypatch):
8989
},
9090
)
9191
result = cmd("-a")
92-
expected = ["py36", "py27", "py34", "pypi", "docs", "notincluded"]
92+
expected = ["py36", "py27", "py37", "pypi", "docs", "notincluded"]
9393
assert result.outlines == expected
9494

9595
result = cmd("-a", "-e", "py")
96-
assert result.outlines == ["py36", "py27", "py34", "pypi", "docs", "py", "notincluded"]
96+
assert result.outlines == ["py36", "py27", "py37", "pypi", "docs", "py", "notincluded"]
9797

9898
monkeypatch.setenv(str("TOXENV"), str("py"))
9999
result = cmd("-a")
100-
assert result.outlines == ["py36", "py27", "py34", "pypi", "docs", "py", "notincluded"]
100+
assert result.outlines == ["py36", "py27", "py37", "pypi", "docs", "py", "notincluded"]
101101

102102
monkeypatch.setenv(str("TOXENV"), str("py36"))
103103
result = cmd("-a")
104-
assert result.outlines == ["py36", "py27", "py34", "pypi", "docs", "notincluded"]
104+
assert result.outlines == ["py36", "py27", "py37", "pypi", "docs", "notincluded"]
105105

106106

107107
def test_listenvs_all_verbose_description(cmd, initproj):
@@ -160,7 +160,7 @@ def test_listenvs_packaging_excluded(cmd, initproj):
160160
filedefs={
161161
"tox.ini": """
162162
[tox]
163-
envlist = py36,py27,py34,pypi,docs
163+
envlist = py36,py27,py37,pypi,docs
164164
isolated_build = True
165165
166166
[testenv:notincluded]
@@ -172,7 +172,7 @@ def test_listenvs_packaging_excluded(cmd, initproj):
172172
},
173173
)
174174
result = cmd("-a")
175-
expected = ["py36", "py27", "py34", "pypi", "docs", "notincluded"]
175+
expected = ["py36", "py27", "py37", "pypi", "docs", "notincluded"]
176176
assert result.outlines == expected, result.outlines
177177

178178

tox.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[tox]
22
envlist = py27,
3-
py34,
43
py35,
54
py36,
65
py37,

0 commit comments

Comments
 (0)