From d1118fbc2a6044121625a9bc4a9a46a308b08f01 Mon Sep 17 00:00:00 2001 From: Chris Withers Date: Mon, 13 Jan 2020 08:00:48 +0000 Subject: [PATCH] update list of supported versions. --- .circleci/config.yml | 32 +++++++++----------------------- README.rst | 2 +- docs/index.txt | 16 ++-------------- setup.cfg | 11 ++--------- tox.ini | 2 +- 5 files changed, 15 insertions(+), 48 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8416914f..d3c62843 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,15 +24,6 @@ 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 @@ -40,8 +31,8 @@ common: &common 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 @@ -49,12 +40,9 @@ common: &common - python/coverage: name: coverage requires: - - python27 - - python34 - - python35 - python36 - python37 - - pypy27 + - python38 - pypy36 - python/pip-docs: @@ -72,7 +60,7 @@ common: &common - check-package: name: check-package-python27 - image: circleci/python:2.7 + image: circleci/python:3.7 requires: - package @@ -83,16 +71,15 @@ 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 @@ -100,9 +87,8 @@ common: &common name: release config: .carthorse.yml requires: - - check-package-python27 - check-package-python37 - - check-package-pypy27 + - check-package-python38 - check-package-pypy36 workflows: diff --git a/README.rst b/README.rst index b4f3163c..279f2dc0 100644 --- a/README.rst +++ b/README.rst @@ -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. diff --git a/docs/index.txt b/docs/index.txt index 27008a0d..f03f838d 100644 --- a/docs/index.txt +++ b/docs/index.txt @@ -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: @@ -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. @@ -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 diff --git a/setup.cfg b/setup.cfg index 42ba277c..647943ca 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -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] diff --git a/tox.ini b/tox.ini index 90ca455d..14eb4f43 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,pypy,py34,py35,py36,py37,docs +envlist = py36,py37,py38,docs [testenv] commands =