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 unsupported Python 2.6 #338

Closed
wants to merge 3 commits into from
Closed
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
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ cache:
directories:
- "$HOME/.cache/pip"
python:
- '2.6'
- pypy
- pypy3
- '2.7'
- '3.2'
- '3.3'
- '3.4'
- '3.5'
- pypy
- pypy3
install:
- travis_retry pip install -r requirements-${TRAVIS_PYTHON_VERSION}.txt --allow-external
argparse
Expand Down
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include AUTHORS
include requirements.txt
include requirements-py26.txt
include requirements-docs.txt
include tox.ini
include unittest.cfg
Expand Down
6 changes: 0 additions & 6 deletions docs/dev/compat.rst

This file was deleted.

1 change: 0 additions & 1 deletion docs/dev/internals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ you want to contribute to nose2.
:maxdepth: 2

main
compat
exceptions
loader
result
Expand Down
4 changes: 2 additions & 2 deletions docs/differences.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Python Versions
^^^^^^^^^^^^^^^

nose supports Python 2.4 and above, but nose2 *only supports Python
2.6, 2.7, 3.2, 3.3, 3.4, 3.5 and pypy*. Unfortunately, supporting Pythons
older than 2.6 along with Python 3 in the same codebase is not practical.
2.7, 3.2, 3.3, 3.4, 3.5 and pypy*. Unfortunately, supporting Pythons
older than 2.6 along with Python 3 in the same codebase is not practical.
Since that is one of the core goals of nose2, support for older versions of
Python had to be sacrificed.

Expand Down
7 changes: 2 additions & 5 deletions docs/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ Dependencies
~~~~~~~~~~~~

For Python 2.7, Python 3.2 and pypy, nose2 requires `six`_ version
1.1. For Python 2.6, nose2 also requires `argparse`_ version 1.2.1 and
`unittest2`_ version 0.5.1. When installing with pip, distribute or
setuptools, these dependencies will be installed automatically.
1.1. When installing with pip, distribute or setuptools, these dependencies
will be installed automatically.


Development version
Expand Down Expand Up @@ -64,5 +63,3 @@ see :doc:`usage` and :doc:`configuration`.
.. _pip : http://pypi.python.org/pypi/pip/1.0.2
.. _pypi : http://pypi.python.org/pypi
.. _six : http://pypi.python.org/pypi/six/1.1.0
.. _argparse : http://pypi.python.org/pypi/argparse/1.2.1
.. _unittest2 : http://pypi.python.org/pypi/unittest2/0.5.1
Empty file removed nose2/backports/__init__.py
Empty file.
264 changes: 0 additions & 264 deletions nose2/backports/ordereddict.py

This file was deleted.

37 changes: 0 additions & 37 deletions nose2/compat.py

This file was deleted.

3 changes: 1 addition & 2 deletions nose2/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@

import logging
import traceback

import six
import unittest

from nose2 import events
from nose2.compat import unittest


log = logging.getLogger(__name__)
Expand Down
2 changes: 1 addition & 1 deletion nose2/main.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import logging
import os
import sys
import unittest

from nose2.compat import unittest
from nose2 import events, loader, runner, session, util


Expand Down
Loading