Merge pull request #153 from wolever/drop-older-python-support

Drop support for older Python versions (2.X, 3.5, 3.6)
wolever · Mar 2, 2023 · c59f15d · c59f15d
2 parents dceaf6f + d85f9a8
commit c59f15d
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 421 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.gitignore b/.gitignore
@@ -20,5 +20,5 @@ Icon?
 .tox
 build/
 .cache/
-
-\.idea/
+.vscode/
+.idea/
diff --git a/README.rst b/README.rst
@@ -179,33 +179,27 @@ Compatibility
 
 `Yes`__ (mostly).
 
-__ https://travis-ci.org/wolever/parameterized
+__ https://app.circleci.com/pipelines/github/wolever/parameterized?branch=master
 
 .. list-table::
    :header-rows: 1
    :stub-columns: 1
 
    * -
-     - Py2.6
-     - Py2.7
-     - Py3.4
-     - Py3.5
-     - Py3.6
      - Py3.7
      - Py3.8
      - Py3.9
-     - PyPy
+     - Py3.10
+     - Py3.11
+     - PyPy3
      - ``@mock.patch``
    * - nose
      - yes
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
-     - yes
-     - yes
+     - no§
+     - no§
      - yes
    * - nose2
      - yes
@@ -215,30 +209,21 @@ __ https://travis-ci.org/wolever/parameterized
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
    * - py.test 2
-     - yes
-     - yes
      - no*
      - no*
      - no*
      - no*
-     - yes
-     - yes
-     - yes
-     - yes
+     - no*
+     - no*
+     - no*
    * - py.test 3
      - yes
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
-     - yes
-     - yes
+     - no*
+     - no*
      - yes
    * - py.test 4
      - no**
@@ -248,9 +233,6 @@ __ https://travis-ci.org/wolever/parameterized
      - no**
      - no**
      - no**
-     - no**
-     - no**
-     - no**
    * - py.test fixtures
      - no†
      - no†
@@ -259,9 +241,6 @@ __ https://travis-ci.org/wolever/parameterized
      - no†
      - no†
      - no†
-     - no†
-     - no†
-     - no†
    * - | unittest
        | (``@parameterized.expand``)
      - yes
@@ -271,29 +250,29 @@ __ https://travis-ci.org/wolever/parameterized
      - yes
      - yes
      - yes
-     - yes
-     - yes
-     - yes
    * - | unittest2
        | (``@parameterized.expand``)
      - yes
      - yes
      - yes
      - yes
+     - no§
+     - no§
      - yes
-     - yes
-     - yes
-     - yes
-     - yes
-     - yes
 
-\*: py.test 2 does `does not appear to work (#71)`__ under Python 3. Please comment on the related issues if you are affected.
+§: nose and unittest2 - both of which were last updated in 2015 - sadly do not
+appear to support Python 3.10 or 3.11.
+
+\*: `py.test 2 does not appear to work under Python 3 (#71)`__, and
+`py.test 3 does not appear to work under Python 3.10 or 3.11 (#154)`__.
 
 \*\*: py.test 4 is not yet supported (but coming!) in `issue #34`__
 
 †: py.test fixture support is documented in `issue #81`__
 
+
 __ https://github.com/wolever/parameterized/issues/71
+__ https://github.com/wolever/parameterized/issues/154
 __ https://github.com/wolever/parameterized/issues/34
 __ https://github.com/wolever/parameterized/issues/81
 
@@ -649,9 +628,10 @@ To migrate a codebase from ``nose-parameterized`` to ``parameterized``:
 FAQ
 ---
 
-What happened to ``nose-parameterized``?
-    Originally only nose was supported. But now everything is supported, and it
-    only made sense to change the name!
+What happened to Python 2.X, 3.5, and 3.6 support?
+    As of version 0.9.0, ``parameterized`` no longer supports Python 2.X, 3.5,
+    or 3.6.  Previous versions of ``parameterized`` - 0.8.1 being the latest -
+    will continue to work, but will not receive any new features or bug fixes.
 
 What do you mean when you say "nose is best supported"?
     There are small caveates with ``py.test`` and ``unittest``: ``py.test``
@@ -668,3 +648,7 @@ Why do I get an ``AttributeError: 'function' object has no attribute 'expand'``
     You've likely installed the ``parametrized`` (note the missing *e*)
     package. Use ``parameterized`` (with the *e*) instead and you'll be all
     set.
+
+What happened to ``nose-parameterized``?
+    Originally only nose was supported. But now everything is supported, and it
+    only made sense to change the name!
diff --git a/parameterized/__init__.py b/parameterized/__init__.py
@@ -1,3 +1,3 @@
 from .parameterized import parameterized, param, parameterized_class
 
-__version__ = "0.8.1"
+__version__ = "0.9.0"
diff --git a/parameterized/parameterized.py b/parameterized/parameterized.py
@@ -19,6 +19,9 @@
     class SkipTest(Exception):
         pass
 
+# NOTE: even though Python 2 support has been dropped, these checks have been
+# left in place to avoid merge conflicts. They can be removed in the future, and
+# future code can be written to assume Python 3.
 PY3 = sys.version_info[0] == 3
 PY2 = sys.version_info[0] == 2
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,15 +1,11 @@
-[build-system]
-requires = ["setuptools>=61.2"]
-build-backend = "setuptools.build_meta"
-
 [project]
 name = "parameterized"
 authors = [{name = "David Wolever", email = "david@wolever.net"}]
 license = {text = "FreeBSD"}
 description = "Parameterized testing with any Python test framework"
 readme = "README.rst"
+requires-python = ">=3.7"
 classifiers = [
-    "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: BSD License",
 ]
@@ -30,3 +26,7 @@ version = {attr = "parameterized.__version__"}
 
 [tool.distutils.bdist_wheel]
 universal = 1
+
+[build-system]
+requires = ["setuptools>=61.2"]
+build-backend = "setuptools.build_meta"
diff --git a/rebuild-circleci-yaml b/rebuild-circleci-yaml
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Rebuilds the .circleci/config.yml file based on the output of ``tox --listenvs``
@@ -21,16 +21,16 @@ jobs:
 
   test-{{ tox_env }}:
     docker:
-      {% if python_ver == "pypy" -%}
-      - image: pypy:2
+      {% if python_ver == "pypy3" -%}
+      - image: pypy:3
       {%- else -%}
       - image: python:{{ python_ver }}
       {%- endif %}
     steps:
       - checkout
       - run:
           name: install tox
-          command: pip install tox==3.7.0
+          command: pip install tox
       - run:
           name: run tests
           command: tox -e {{ tox_env }}
@@ -48,22 +48,25 @@ workflows:
 # !!! WARNING !!!
 """)
 
-# Maps tox python versions (ex, "py27") to Travis Python versions (ex, "2.7")
+# Maps tox python versions (ex, "py27") to CircleCI Python versions (ex, "2.7")
 py_version_map = {
     "py26": "2.6",
     "py27": "2.7",
     "py35": "3.5",
     "py36": "3.6",
     "py37": "3.7",
     "py38": "3.8",
-    "py39": "3.9-rc",
-    "pypy": "pypy",
+    "py39": "3.9",
+    "py310": "3.10",
+    "py311": "3.11",
+    "pypy3": "pypy3",
 }
 
 def main():
-    env_list_str = sp.check_output("tox --listenvs", shell=True).splitlines()
+    env_list_bytes = sp.check_output("tox --listenvs", shell=True).splitlines()
     env_list = []
-    for env in env_list_str:
+    for env_bytes in env_list_bytes:
+        env = env_bytes.decode("utf-8")
         if not env.strip():
             continue
         py_ver, _, _ = env.partition("-")

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,7 @@
 [tox]
-envlist=py{27,35,36,py}-{nose,nose2,pytest2,pytest3,unit,unit2},py{37,38,39,310,311}-{nose,nose2,pytest3,unit,unit2}
+# NOTE: when adding Python versions, also update and re-run `./rebuild-circleci-yaml`
+envlist=pypy3-{nose,nose2,pytest3,unit,unit2},py{37,38,39}-{nose,nose2,pytest3,unit,unit2},py{310,311}-{unit,nose2}
+
 [testenv]
 deps=
     nose
@@ -16,4 +18,4 @@ commands=
     pytest3: py.test parameterized/test.py
     #pytest4: py.test parameterized/test.py
     unit: python -m unittest parameterized.test
-    unit2: unit2 parameterized.test
+    unit2: unit2 parameterized.test