Skip to content

Commit

Permalink
update list of supported versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
cjw296 committed Jan 13, 2020
1 parent 5722852 commit d1118fb
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 48 deletions.
32 changes: 9 additions & 23 deletions .circleci/config.yml
Expand Up @@ -24,37 +24,25 @@ jobs:

common: &common
jobs:
- python/pip-run-tests:
name: python27
image: circleci/python:2.7
- python/pip-run-tests:
name: python34
image: circleci/python:3.4
- python/pip-run-tests:
name: python35
image: circleci/python:3.5
- python/pip-run-tests:
name: python36
image: circleci/python:3.6
- python/pip-run-tests:
name: python37
image: circleci/python:3.7
- python/pip-run-tests:
name: pypy27
image: pypy:2.7
name: python38
image: circleci/python:3.8
- python/pip-run-tests:
name: pypy36
image: pypy:3.6

- python/coverage:
name: coverage
requires:
- python27
- python34
- python35
- python36
- python37
- pypy27
- python38
- pypy36

- python/pip-docs:
Expand All @@ -72,7 +60,7 @@ common: &common

- check-package:
name: check-package-python27
image: circleci/python:2.7
image: circleci/python:3.7
requires:
- package

Expand All @@ -83,26 +71,24 @@ common: &common
- package

- check-package:
name: check-package-pypy27
image: pypy:2.7
python: pypy
name: check-package-python38
image: circleci/python:3.8
requires:
- package

- check-package:
name: check-package-pypy36
image: pypy:3.6
python: pypy3
image: pypy:2.7
python: pypy
requires:
- package

- python/release:
name: release
config: .carthorse.yml
requires:
- check-package-python27
- check-package-python37
- check-package-pypy27
- check-package-python38
- check-package-pypy36

workflows:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -7,7 +7,7 @@ mock is now part of the Python standard library, available as `unittest.mock
onwards.

This package contains a rolling backport of the standard library mock code
compatible with Python 2.7 and 3.4 and up.
compatible with Python 3.6 and up.

Please see the standard library documentation for more details.

Expand Down
16 changes: 2 additions & 14 deletions docs/index.txt
Expand Up @@ -25,6 +25,8 @@ Python Version Compatibility

* Version 2.0.0 is the last version offering official Jython support.

* version 3.0.5 is the last version supporting Python 3.5 and lower.

.. index:: installing
.. _installing:

Expand Down Expand Up @@ -77,9 +79,6 @@ Checkout from git (see :ref:`installing`) and submit pull requests.
Committers can just push as desired: since all semantic development takes
place in cPython, the backport process is as lightweight as we can make it.

mock is CI tested using Travis-CI on Python versions 2.7, 3.4,
3.5, 3.6, pypy, pypy3.

If you end up fixing anything backport-specific, please add an entry
to the top of ``CHANGELOG.rst`` so it shows up in the next release
notes.
Expand All @@ -104,17 +103,6 @@ non-bugfix changes, patch on bugfix only changes.
Backporting rules
-----------------

- ``isinstance`` checks in cPython to ``type`` need to check ``ClassTypes``.
Code calling ``obj.isidentifier`` needs to change to ``_isidentifier(obj)``.

- f-strings need to be rewritten using some other string substitution.

- ``assertRaisesRegex`` needs to be ``assertRaisesRegexp`` for Python 2.

- If test code won't compile on a particular version of Python, move it to
a matching ``_py{version}.py`` file. If ``{version}`` isn't 3, adjust
``conftest.py``.

- If code such as this causes coverage checking to drop below 100%:

.. code-block:: python
Expand Down
11 changes: 2 additions & 9 deletions setup.cfg
Expand Up @@ -12,13 +12,9 @@ classifiers =
License :: OSI Approved :: BSD License
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: Implementation :: CPython
Programming Language :: Python :: Implementation :: PyPy
Topic :: Software Development :: Libraries
Expand All @@ -28,10 +24,7 @@ keyword =
testing, test, mock, mocking, unittest, patching, stubs, fakes, doubles

[options]
install_requires =
six
funcsigs>=1;python_version<"3.3"
python_requires=>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
python_requires=>=3.6
packages = mock

[options.extras_require]
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py27,pypy,py34,py35,py36,py37,docs
envlist = py36,py37,py38,docs

[testenv]
commands =
Expand Down

0 comments on commit d1118fb

Please sign in to comment.