IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop support for EOL Python 2.6

Browse Source
This commit is contained in:
Hugo
2017-12-21 10:55:57 +02:00
parent d3229af3da
commit ed2db3d03a
6 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -12,7 +12,6 @@ notifications:
- pytest-commit@python.org - pytest-commit@python.org
python: python:
- '2.6'
- '2.7' - '2.7'
- '3.4' - '3.4'
- '3.5' - '3.5'

2
README.rst
View File

@@ -229,7 +229,7 @@ You can also add default environments like this:
.. code-block:: ini .. code-block:: ini
[pytest] [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:: and then just type::

1
appveyor.yml
View File

@@ -1,7 +1,6 @@
environment: environment:
matrix: matrix:
# note: please use "tox --listenvs" to populate the build matrix # note: please use "tox --listenvs" to populate the build matrix
- TOXENV: "py26-pytest30"
- TOXENV: "py27-pytest30" - TOXENV: "py27-pytest30"
- TOXENV: "py34-pytest30" - TOXENV: "py34-pytest30"
- TOXENV: "py35-pytest30" - TOXENV: "py35-pytest30"

11
setup.py
View File

@@ -1,12 +1,7 @@
from sys import version_info
from setuptools import setup, find_packages from setuptools import setup, find_packages
install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked'] install_requires = ['execnet>=1.1', 'pytest>=3.0.0', 'pytest-forked']
if version_info < (2, 7):
install_requires.append('ordereddict')
setup( setup(
name="pytest-xdist", name="pytest-xdist",
@@ -27,6 +22,7 @@ setup(
], ],
}, },
zip_safe=False, zip_safe=False,
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
install_requires=install_requires, install_requires=install_requires,
setup_requires=['setuptools_scm'], setup_requires=['setuptools_scm'],
classifiers=[ classifiers=[
@@ -41,6 +37,11 @@ setup(
'Topic :: Software Development :: Quality Assurance', 'Topic :: Software Development :: Quality Assurance',
'Topic :: Utilities', 'Topic :: Utilities',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
], ],
) )

2
tox.ini
View File

@@ -1,7 +1,7 @@
[tox] [tox]
# if you change the envlist, please update .travis.yml file as well # if you change the envlist, please update .travis.yml file as well
envlist= 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{30,31,32}-pexpect
py{27,36}-pytest{master,features} py{27,36}-pytest{master,features}
flakes flakes

11
xdist/scheduler/loadscope.py
View File

@@ -1,14 +1,9 @@
try: from collections import OrderedDict
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 _pytest.runner import CollectReport
from py.log import Producer
from xdist.slavemanage import parse_spec_config
from xdist.report import report_collection_diff from xdist.report import report_collection_diff
from xdist.slavemanage import parse_spec_config
class LoadScopeScheduling: class LoadScopeScheduling: