Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cleanup] Remove artefacts from old py34 support #1625

Merged
merged 1 commit into from
Jul 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Asmund Grammeltwedt
Barney Gale
Barry Warsaw
Bartolome Sanchez Salado
Bastien Vallet
Benoit Pierre
Bernat Gabor
Brett Langdon
Expand Down
2 changes: 1 addition & 1 deletion docs/drafts/tox_conda_notes_niccodemus.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type=conda-env

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

1. tox_addoption can now add new "testenv" sections to tox.ini:
Expand Down
18 changes: 9 additions & 9 deletions docs/example/basic.rst
Original file line number Diff line number Diff line change
Expand Up @@ -359,18 +359,18 @@ use :ref:`generative-envlist` and :ref:`conditional settings <factors>` to expre
.. code-block:: ini

[tox]
envlist = py{27,34,36}-django{15,16}-{sqlite,mysql}
envlist = py{36,37,38}-django{22,30}-{sqlite,mysql}

[testenv]
deps =
django15: Django>=1.5,<1.6
django16: Django>=1.6,<1.7
# use PyMySQL if factors "py34" and "mysql" are present in env name
py34-mysql: PyMySQL
# use urllib3 if any of "py36" or "py27" are present in env name
py27,py36: urllib3
# mocking sqlite on 2.7 and 3.6 if factor "sqlite" is present
py{27,36}-sqlite: mock
django22: Django>=2.2,<2.3
django30: Django>=3.0,<3.1
# use PyMySQL if factors "py37" and "mysql" are present in env name
py38-mysql: PyMySQL
# use urllib3 if any of "py36" or "py37" are present in env name
py36,py37: urllib3
# mocking sqlite on 3.6 and 3.7 if factor "sqlite" is present
py{36,37}-sqlite: mock


Using generative section names
Expand Down
4 changes: 2 additions & 2 deletions docs/example/unittest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ that looks like this:
.. code-block:: ini

[tox]
envlist = py27,py34,py35,py36
envlist = py27,py35,py36,py37

[testenv]
deps = unittest2
Expand All @@ -74,7 +74,7 @@ that looks like this:

mock uses unittest2_ to run the tests. Invoking ``tox`` starts test
discovery by executing the ``unit2 discover``
commands on Python 2.7, 3.4, 3.5 and 3.6 respectively. Against
commands on Python 2.7, 3.5, 3.6 and 3.7 respectively. Against
Python3.6 and Python2.7 it will additionally run sphinx-mediated
doctests. If building the docs fails, due to a reST error, or
any of the doctests fails, it will be reported by the tox run.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ Current features
* uses pip_ and setuptools_ by default. Support for configuring the installer command
through :conf:`install_command=ARGV`.

* **cross-Python compatible**: CPython-2.7, 3.4 and higher, Jython and pypy_.
* **cross-Python compatible**: CPython-2.7, 3.5 and higher, Jython and pypy_.
gaborbernat marked this conversation as resolved.
Show resolved Hide resolved

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

Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ tox installation
Install info in a nutshell
----------------------------------

**Pythons**: CPython 2.7 and 3.4 or later, Jython-2.5.1, pypy-1.9ff
**Pythons**: CPython 2.7 and 3.5 or later, Jython-2.5.1, pypy-1.9ff
gaborbernat marked this conversation as resolved.
Show resolved Hide resolved

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

Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ testing =
flaky>=3.4.0
freezegun>=0.3.11
pathlib2>=2.3.3
psutil>=5.6.1
pytest>=4.0.0
pytest-cov>=2.5.1
pytest-mock>=1.10.0
pytest-randomly>=1.0.0
pytest-xdist>=1.22.2
psutil>=5.6.1;python_version != "3.4"
gaborbernat marked this conversation as resolved.
Show resolved Hide resolved

[options.packages.find]
where = src
Expand Down
32 changes: 16 additions & 16 deletions tests/unit/session/test_list_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ def test_listenvs(cmd, initproj, monkeypatch):
filedefs={
"tox.ini": """
[tox]
envlist=py36,py27,py34,pypi,docs
envlist=py36,py27,py37,pypi,docs
description= py27: run pytest on Python 2.7
py34: run pytest on Python 3.6
py37: run pytest on Python 3.6
pypi: publish to PyPI
docs: document stuff
notincluded: random extra
Expand All @@ -22,18 +22,18 @@ def test_listenvs(cmd, initproj, monkeypatch):
)

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

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

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

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


def test_listenvs_verbose_description(cmd, initproj):
Expand All @@ -42,11 +42,11 @@ def test_listenvs_verbose_description(cmd, initproj):
filedefs={
"tox.ini": """
[tox]
envlist=py36,py27,py34,pypi,docs
envlist=py36,py27,py37,pypi,docs
[testenv]
description= py36: run pytest on Python 3.6
py27: run pytest on Python 2.7
py34: run pytest on Python 3.4
py37: run pytest on Python 3.7
pypi: publish to PyPI
docs: document stuff
notincluded: random extra
Expand All @@ -65,7 +65,7 @@ def test_listenvs_verbose_description(cmd, initproj):
"default environments:",
"py36 -> run pytest on Python 3.6",
"py27 -> run pytest on Python 2.7",
"py34 -> run pytest on Python 3.4",
"py37 -> run pytest on Python 3.7",
"pypi -> publish to PyPI",
"docs -> let me overwrite that",
]
Expand All @@ -78,7 +78,7 @@ def test_listenvs_all(cmd, initproj, monkeypatch):
filedefs={
"tox.ini": """
[tox]
envlist=py36,py27,py34,pypi,docs
envlist=py36,py27,py37,pypi,docs

[testenv:notincluded]
changedir = whatever
Expand All @@ -89,19 +89,19 @@ def test_listenvs_all(cmd, initproj, monkeypatch):
},
)
result = cmd("-a")
expected = ["py36", "py27", "py34", "pypi", "docs", "notincluded"]
expected = ["py36", "py27", "py37", "pypi", "docs", "notincluded"]
assert result.outlines == expected

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

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

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


def test_listenvs_all_verbose_description(cmd, initproj):
Expand Down Expand Up @@ -160,7 +160,7 @@ def test_listenvs_packaging_excluded(cmd, initproj):
filedefs={
"tox.ini": """
[tox]
envlist = py36,py27,py34,pypi,docs
envlist = py36,py27,py37,pypi,docs
isolated_build = True

[testenv:notincluded]
Expand All @@ -172,7 +172,7 @@ def test_listenvs_packaging_excluded(cmd, initproj):
},
)
result = cmd("-a")
expected = ["py36", "py27", "py34", "pypi", "docs", "notincluded"]
expected = ["py36", "py27", "py37", "pypi", "docs", "notincluded"]
assert result.outlines == expected, result.outlines


Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[tox]
envlist = py27,
py34,
gaborbernat marked this conversation as resolved.
Show resolved Hide resolved
py35,
py36,
py37,
Expand Down