-
-
Notifications
You must be signed in to change notification settings - Fork 531
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
drop Python 2.6 and 3.3 support #689
Conversation
@@ -59,21 +51,20 @@ def main(): | |||
author_email='[email protected]', | |||
packages=['tox'], | |||
entry_points={'console_scripts': 'tox=tox:cmdline\ntox-quickstart=tox._quickstart:main'}, | |||
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 😄
changelog/679.feature.rst
Outdated
@@ -0,0 +1,2 @@ | |||
drop Pyhton ``2.6`` and ``3.3`` support: ``setuptools`` dropped supporting these, and as we depend on it we'll follow | |||
up with doing the same (use ``tox <= 2.9.1`` if you still need this support) - by @gaborbernat |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can mention that a recent enough pip
(>=9) should automatically install < 2.9 on Python 2.6 and Python 3.3.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome, I made some minor comments 👍
doc/example/nose.rst
Outdated
@@ -25,7 +25,7 @@ and the following ``tox.ini`` content: | |||
|
|||
you can invoke ``tox`` in the directory where your ``tox.ini`` resides. | |||
``tox`` will sdist-package your project create two virtualenv environments | |||
with the ``python2.6`` and ``python2.5`` interpreters, respectively, and will | |||
with the ``python3.6`` and ``python2.5`` interpreters, respectively, and will |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably worth updating python2.5
to a more modern version as well
doc/index.rst
Outdated
@@ -68,7 +68,7 @@ Current features | |||
* uses pip_ and setuptools_ by default. Support for configuring the installer command | |||
through :confval:`install_command=ARGV`. | |||
|
|||
* **cross-Python compatible**: CPython-2.6, 2.7, 3.2 and higher, | |||
* **cross-Python compatible**: CPython-2.7, 3.3 and higher, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
*3.4 and higher
setup.py
Outdated
install_requires = ['py>=1.4.17', 'pluggy>=0.3.0,<1.0', 'six'] | ||
extras_require = {} | ||
if has_environment_marker_support(): | ||
extras_require[':python_version=="2.6"'] = ['argparse'] | ||
extras_require[':python_version=="3.2"'] = virtualenv_capped | ||
extras_require[':python_version!="3.2"'] = virtualenv_open |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This section can be removed and virtualenv_open
can be added directly to install_requires
above.
looks like we're hitting travis-ci/travis-ci#8363 now |
tox.ini
Outdated
@@ -107,5 +96,5 @@ exclude_lines = if __name__ == ["']__main__["']: | |||
addopts = -rsxX | |||
rsyncdirs = tests tox | |||
looponfailroots = tox tests | |||
norecursedirs = .hg .tox | |||
norecursedirs = .hg {toxworkdir} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this working as intended? I kind of doubt that pytest is going to properly substitute toxworkdir
tox.ini
Outdated
[testenv:X] | ||
description = print the positional arguments passed in with echo | ||
commands = echo {posargs} | ||
|
||
[testenv:coverage] | ||
description = [run locally after tests]: combine coverage data and create reports | ||
skip_install = True | ||
changedir={toxworkdir} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is unrelated to the changes here (and it seems breaking windows) -- did you accidentally commit this over another WIP branch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no accident, will take a look
changelog/679.feature.rst
Outdated
@@ -0,0 +1,2 @@ | |||
drop Pyhton ``2.6`` and ``3.3`` support: ``setuptools`` dropped supporting these, and as we depend on it we'll follow |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pyhton
doc/config-v2.rst
Outdated
@@ -195,7 +195,7 @@ Default settings related to environments names/variants | |||
tox comes with predefined settings for certain variants, namely: | |||
|
|||
* ``{easy,pip}`` use easy_install or pip respectively | |||
* ``{py24,py25,py26,py27,py31,py32,py33,py34,pypy19]`` use the respective | |||
* ``{py27,py36,py35,py34,pypy19]`` use the respective |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I'd expect these to be in increasing order instead of decreasing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same for the rest of the docs -- we should consistently:
- mention pythonx.x, pythony.y in increasing order
- list tox environments in increasing order
I understand this makes your diff less minimal, but it makes the docs read better :)
doc/example/result.rst
Outdated
@@ -40,7 +40,7 @@ This will create a json-formatted result file using this schema: | |||
"platform": "linux2", | |||
"installpkg": { | |||
"basename": "tox-1.6.0.dev1.zip", | |||
"sha256": "b6982dde5789a167c4c35af0d34ef72176d0575955f5331ad04aee9f23af4326", | |||
"sha356": "b6982dde5789a167c4c35af0d34ef72176d0575955f5331ad04aee9f23af4336", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
woops, nice sed :D
tests/test_config.py
Outdated
@@ -1388,7 +1388,7 @@ def test_factors(self, newconfig): | |||
conf = newconfig([], inisource) | |||
configs = conf.envconfigs | |||
assert [dep.name for dep in configs['a-x'].deps] == \ | |||
["dep-all", "dep-a", "dep-x"] | |||
["dep-all", "dep-a", "dep-x"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
orthogonal to this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mostly looks good, fix the two typos and the ordering and
doc/config-v2.rst
Outdated
@@ -253,13 +253,13 @@ Another `tox.ini | |||
has 233 lines and runs tests against multiple Postgres and Mysql | |||
engines. It also performs backend-specific test commands, passing | |||
different command line options to the test script. With the new tox-1.X | |||
we not only can do the same with 32 non-repetive configuration lines but | |||
we not only can do the same with 35 non-repetive configuration lines but |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this one was supposed to change
@@ -74,7 +74,7 @@ which will make the sphinx tests part of your test run. | |||
Selecting one or more environments to run tests against | |||
-------------------------------------------------------- | |||
|
|||
Using the ``-e ENV[,ENV2,...]`` option you explicitly list | |||
Using the ``-e ENV[,ENV36,...]`` option you explicitly list |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this one looks like a mistake too
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this one I think is fine 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't or I wouldn't have pointed it out. This is a listing of environments and yes while most of them are usually python environments this is documenting the command line.
doc/example/nose.rst
Outdated
@@ -25,7 +25,7 @@ and the following ``tox.ini`` content: | |||
|
|||
you can invoke ``tox`` in the directory where your ``tox.ini`` resides. | |||
``tox`` will sdist-package your project create two virtualenv environments | |||
with the ``python2.6`` and ``python2.5`` interpreters, respectively, and will | |||
with the ``python3.6`` and ``python2.7`` interpreters, respectively, and will |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ordering here
doc/example/unittest.rst
Outdated
@@ -76,8 +76,8 @@ the checkout has a tox.ini_ 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.4, 2.5, 2.6 and 2.7 respectively. Against | |||
Python2.6 and Python2.7 it will additionally run sphinx-mediated | |||
commands on Python 2.4, 2.5, 3.6 and 2.7 respectively. Against |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ordering here, also 2.4 and 2.5
doc/example/unittest.rst
Outdated
@@ -50,13 +50,13 @@ the checkout has a tox.ini_ that looks like this: | |||
.. code-block:: ini | |||
|
|||
[tox] | |||
envlist = py24,py25,py26,py27 | |||
envlist = py34,py35,py36,py27 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ordering here
doc/example/unittest.rst
Outdated
@@ -19,7 +19,7 @@ and add the following ``tox.ini`` to it: | |||
.. code-block:: ini | |||
|
|||
[tox] | |||
envlist = py25,py26,py27 | |||
envlist = py35,py36,py27 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ordering here
doc/index.rst
Outdated
|
||
tox | ||
|
||
and watch things happening (you must have python2.6 and python2.7 installed in your | ||
and watch things happening (you must have python3.6 and python2.7 installed in your |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ordering here
tox/interpreters.py
Outdated
@@ -17,7 +17,7 @@ def __init__(self, hook): | |||
|
|||
def get_executable(self, envconfig): | |||
""" return path object to the executable for the given | |||
name (e.g. python2.6, python2.7, python etc.) | |||
name (e.g. python3.6, python2.7, python etc.) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ordering here
Codecov Report
@@ Coverage Diff @@
## master #689 +/- ##
==========================================
- Coverage 90.77% 89.45% -1.32%
==========================================
Files 11 11
Lines 2373 2371 -2
Branches 402 401 -1
==========================================
- Hits 2154 2121 -33
- Misses 144 175 +31
Partials 75 75
Continue to review full report at Codecov.
|
Resolves #679.
Took the opportunity to also update our documentation, so we no longer refer to
Python <2.7
orPython <=3.3
in there.