Skip to content

Commit

Permalink
Officially drop 2.6 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
rbtcollins committed Jul 9, 2015
1 parent f31b176 commit 8a2e870
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: false
language: python
python:
- "2.6"
- "2.7"
- "3.2"
- "3.3"
Expand Down
11 changes: 6 additions & 5 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ assertions about which methods / attributes were used and arguments they were
called with. You can also specify return values and set needed attributes in
the normal way.

mock is CI tested using Travis-CI on Python versions 2.6, 2.7, 3.2, 3.3, 3.4,
3.5, nightly Python 3 builds, pypy, pypy3. Jython support is desired, if
mock is CI tested using Travis-CI on Python versions 2.7, 3.2, 3.3, 3.4, 3.5,
nightly Python 3 builds, pypy, pypy3. Jython support is desired, if
someone could contribute a patch to .travis.jml to support it that would be
excellent.

The last release of mock to support 2.6 was 1.0.1. mock 1.1.0 and above require
Pythno 2.7 or higher.

The mock module also provides utility functions / objects to assist with
testing, particularly monkey patching.

Expand Down Expand Up @@ -173,9 +176,7 @@ the `__init__` method, and on callable objects where it copies the signature of
the `__call__` method.

The distribution contains tests and documentation. The tests require
`unittest2 <http://pypi.python.org/pypi/unittest2>`_ to run on Python 2.5, 2.6
or 3.1. For Python 2.7 and 3.2 they can be run with
`python -m unittest discover`.
`unittest2 <http://pypi.python.org/pypi/unittest2>`_. Run them with `unit2`.

Docs from the in-development version of `mock` can be found at
`mock.readthedocs.org <http://mock.readthedocs.org>`_.
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 2.5',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.1',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: PyPy',
'Programming Language :: Python :: Implementation :: Jython',
Expand Down

0 comments on commit 8a2e870

Please sign in to comment.