Drop support for EOL Python 2.6
This commit is contained in:
@@ -12,7 +12,6 @@ notifications:
|
||||
- pytest-commit@python.org
|
||||
|
||||
python:
|
||||
- '2.6'
|
||||
- '2.7'
|
||||
- '3.4'
|
||||
- '3.5'
|
||||
|
||||
@@ -229,7 +229,7 @@ You can also add default environments like this:
|
||||
.. code-block:: ini
|
||||
|
||||
[pytest]
|
||||
addopts = --tx ssh=myhost//python=python2.5 --tx ssh=myhost//python=python2.6
|
||||
addopts = --tx ssh=myhost//python=python2.5 --tx ssh=myhost//python=python3.6
|
||||
|
||||
and then just type::
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
environment:
|
||||
matrix:
|
||||
# note: please use "tox --listenvs" to populate the build matrix
|
||||
- TOXENV: "py26-pytest30"
|
||||
- TOXENV: "py27-pytest30"
|
||||
- TOXENV: "py34-pytest30"
|
||||
- TOXENV: "py35-pytest30"
|
||||
|
||||
11
setup.py
11
setup.py
@@ -1,12 +1,7 @@
|
||||
from sys import version_info
|
||||
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked']
|
||||
|
||||
if version_info < (2, 7):
|
||||
install_requires.append('ordereddict')
|
||||
|
||||
|
||||
setup(
|
||||
name="pytest-xdist",
|
||||
@@ -27,6 +22,7 @@ setup(
|
||||
],
|
||||
},
|
||||
zip_safe=False,
|
||||
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
|
||||
install_requires=install_requires,
|
||||
setup_requires=['setuptools_scm'],
|
||||
classifiers=[
|
||||
@@ -41,6 +37,11 @@ setup(
|
||||
'Topic :: Software Development :: Quality Assurance',
|
||||
'Topic :: Utilities',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Programming Language :: Python :: 3.4',
|
||||
'Programming Language :: Python :: 3.5',
|
||||
'Programming Language :: Python :: 3.6',
|
||||
],
|
||||
)
|
||||
|
||||
2
tox.ini
2
tox.ini
@@ -1,7 +1,7 @@
|
||||
[tox]
|
||||
# if you change the envlist, please update .travis.yml file as well
|
||||
envlist=
|
||||
py{26,27,34,35,36}-pytest{30,31,32}
|
||||
py{27,34,35,36}-pytest{30,31,32}
|
||||
py{27,36}-pytest{30,31,32}-pexpect
|
||||
py{27,36}-pytest{master,features}
|
||||
flakes
|
||||
|
||||
@@ -1,14 +1,9 @@
|
||||
try:
|
||||
from collections import OrderedDict
|
||||
except ImportError:
|
||||
# Support for Python 2.6
|
||||
from ordereddict import OrderedDict
|
||||
|
||||
from py.log import Producer
|
||||
from _pytest.runner import CollectReport
|
||||
|
||||
from xdist.slavemanage import parse_spec_config
|
||||
from py.log import Producer
|
||||
from xdist.report import report_collection_diff
|
||||
from xdist.slavemanage import parse_spec_config
|
||||
|
||||
|
||||
class LoadScopeScheduling:
|
||||
|
||||
Reference in New Issue
Block a user