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

Drop support for EOL Python 2.6 #25

Merged
merged 6 commits into from
Mar 12, 2018
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: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: python
python:
- "2.7"
- "2.6"
- "3.4"
- "3.5"
- "3.6"
Expand Down
17 changes: 11 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
pytest-twisted - test twisted code with pytest
==============================================================================

|Travis|_ |AppVeyor|_ |Pythons|
|PyPI| |Pythons| |Travis| |AppVeyor|

:Authors: Ralf Schmitt, Kyle Altendorf, Victor Titor
:Version: 1.7.1
Expand Down Expand Up @@ -88,15 +88,20 @@ corotwine work with pytest-twisted::
That's all.


.. |PyPI| image:: https://img.shields.io/pypi/v/pytest-twisted.svg
:alt: PyPI version
:target: https://pypi.python.org/pypi/pytest-twisted

.. |Pythons| image:: https://img.shields.io/pypi/pyversions/pytest-twisted.svg
:alt: Supported Python versions
:target: https://pypi.python.org/pypi/pytest-twisted

.. |Travis| image:: https://travis-ci.org/pytest-dev/pytest-twisted.svg?branch=master
:alt: Travis build status
.. _Travis: https://travis-ci.org/pytest-dev/pytest-twisted
:target: https://travis-ci.org/pytest-dev/pytest-twisted

.. |AppVeyor| image:: https://ci.appveyor.com/api/projects/status/us5l0l9p7hyp2k6x/branch/master?svg=true
:alt: AppVeyor build status
.. _AppVeyor: https://ci.appveyor.com/project/vtitor/pytest-twisted

.. |Pythons| image:: https://img.shields.io/pypi/pyversions/pytest-twisted.svg
:alt: supported Python versions
:target: https://ci.appveyor.com/project/vtitor/pytest-twisted

.. _guide: CONTRIBUTING.rst
6 changes: 0 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ environment:
VENV: "%APPVEYOR_BUILD_FOLDER%\\venv"

matrix:
- TOXENV: py26
PYTHON: "C:\\Python26"

- TOXENV: py26
PYTHON: "C:\\Python26-x64"

- TOXENV: py27
PYTHON: "C:\\Python27"

Expand Down
4 changes: 2 additions & 2 deletions pytest_twisted.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class _instances:


def pytest_namespace():
return dict(inlineCallbacks=inlineCallbacks, blockon=blockon)
return {'inlineCallbacks': inlineCallbacks, 'blockon': blockon}


def blockon(d):
Expand Down Expand Up @@ -172,7 +172,7 @@ def _install_reactor(reactor_installer, reactor_type):
import twisted.internet.reactor
if not isinstance(twisted.internet.reactor, reactor_type):
raise WrongReactorAlreadyInstalledError(
'expected {0} but found {1}'.format(
'expected {} but found {}'.format(
reactor_type,
type(twisted.internet.reactor),
)
Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
'Programming Language :: Python',
'Topic :: Software Development :: Testing',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
Expand Down
6 changes: 3 additions & 3 deletions testing/test_basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ def format_run_result_output_for_assert(run_result):
return textwrap.dedent('''\

---- stdout
{0}
{}
---- stderr
{1}
{}
----''').format(
run_result.stdout.str(),
run_result.stderr.str(),
Expand All @@ -35,7 +35,7 @@ def skip_if_reactor_not(expected_reactor):
actual_reactor = pytest.config.getoption('reactor')
return pytest.mark.skipif(
actual_reactor != expected_reactor,
reason='reactor is {0} not {1}'.format(
reason='reactor is {} not {}'.format(
actual_reactor,
expected_reactor,
),
Expand Down
8 changes: 3 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
[tox]
envlist=
py{26,27,34}-defaultreactor
py{27,34}-defaultreactor
py{35,36}-{default,qt5}reactor
linting


[testenv]
deps=
greenlet
py26: pytest<3.3
py{27,34,35,36}: pytest
py26: twisted<15.5
py{27,34,35,36}: twisted
pytest
twisted
qt5reactor: pytest-qt
qt5reactor: qt5reactor
qt5reactor: pytest-xvfb
Expand Down