Skip to content

Commit 631b36f

Browse files
committed
Cleanup of supported version
Due to changes in external dependency to pytest-xdist, pytest-xdist<1.26.0 is not supported anymore.
1 parent 032fa8f commit 631b36f

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

AUTHORS.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ Authors
55
original idea and implementation, new features and improvements
66
`Oleg Pidsadnyi <[email protected]>`_
77
bugfixes and further improvements
8+
`Dariusz Smigiel <[email protected]>`_
9+
bugfixes and further improvements
810

911
These people have contributed to `pytest-cloud`, in alphabetical order:
1012

1113
* `Andreas Pelme <[email protected]>`_
12-
* `Dariusz Smigiel <[email protected]>`_
1314
* `Loic Dachary <[email protected]>`_
1415
* `Michael Overmeyer <[email protected]>`_
1516
* `Orthographic Pedant <[email protected]>`_

CHANGES.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ Changelog
55
-----
66

77
- Add config option to select cipher for ssh connection (dasm)
8+
- Fix deprecation warnings for pytest (dasm)
9+
- Support pytest-xdist >= 1.26.0 (dasm)
10+
- Support pytest >= 3.6.1 (version supported by pytest-xdist without a bug) (dasm)
11+
- Remove support for Python 3.0, 3.1, 3.2, 3.3 (consistent with pytest-xdist) (dasm)
812

913
3.0.1
1014
-----

pytest_cloud/patches.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def setup(self):
8080
self.channel.setcallback(
8181
self.process_from_remote,
8282
endmarker=self.ENDMARK)
83-
self.channel.send((self.slaveinput, args, option_dict))
83+
self.channel.send((self.slaveinput, args, option_dict, None))
8484

8585

8686
def apply_patches():

setup.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@
2727
url='https://github.com/pytest-dev/pytest-cloud',
2828
install_requires=[
2929
'psutil',
30-
'pytest>=2.7.0',
31-
'pytest-xdist>=1.22.1',
30+
'pytest>=3.6.1',
31+
'pytest-xdist>=1.26.0',
3232
'setuptools',
3333
'six',
3434
'timeout-decorator>=0.3.2',
3535
],
36+
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
3637
classifiers=[
3738
'Development Status :: 6 - Mature',
3839
'Intended Audience :: Developers',
@@ -45,7 +46,7 @@
4546
'Topic :: Utilities',
4647
'Programming Language :: Python :: 2',
4748
'Programming Language :: Python :: 3',
48-
] + [('Programming Language :: Python :: %s' % x) for x in '2.7 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7'.split()],
49+
] + [('Programming Language :: Python :: %s' % x) for x in '2.7 3 3.4 3.5 3.6 3.7'.split()],
4950
tests_require=['tox'],
5051
entry_points={'pytest11': [
5152
'pytest-cloud=pytest_cloud.plugin',

0 commit comments

Comments
 (0)