diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5051377..8b14f1d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,6 @@ jobs: config: # [Python version, tox env] - ["3.9", "lint"] - - ["3.6", "py36"] - ["3.7", "py37"] - ["3.8", "py38"] - ["3.9", "py39"] diff --git a/.meta.toml b/.meta.toml index a010ff9..4c5329d 100644 --- a/.meta.toml +++ b/.meta.toml @@ -2,11 +2,10 @@ # https://github.com/zopefoundation/meta/tree/master/config/pure-python [meta] template = "pure-python" -commit-id = "200573eb414d2228d463da3de7d71a6d6335a704" +commit-id = "c7a64084" [python] with-pypy = false -with-legacy-python = false with-docs = true with-sphinx-doctests = true with-windows = true @@ -49,7 +48,7 @@ testenv-additional = [ " coverage combine", " coverage html", " coverage report -m --fail-under=100", - "depends = py36,py37,py38,py39,py39-datetime,py310,py311,coverage", + "depends = py37,py38,py39,py39-datetime,py310,py311,py312coverage", ] coverage-basepython = "python3.8" coverage-command = "pytest --cov=src --cov=tests --cov-report= {posargs}" diff --git a/CHANGES.rst b/CHANGES.rst index 0f3c5f7..1b2260a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,10 +1,14 @@ Changes ======= -6.1 (unreleased) +7.0 (unreleased) ---------------- -- Nothing changed yet. +Backwards incompatible changes +++++++++++++++++++++++++++++++ + +- Drop support for Python 3.6. + 6.0 (2022-11-03) diff --git a/setup.cfg b/setup.cfg index 7c0c085..71c4c25 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ ignore = force_single_line = True combine_as_imports = True sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER -known_third_party = six, docutils, pkg_resources +known_third_party = six, docutils, pkg_resources, pytz known_zope = known_first_party = default_section = ZOPE diff --git a/setup.py b/setup.py index d52ded8..a762033 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ def read(*rnames): setup( name='RestrictedPython', - version='6.1.dev0', + version='7.0.dev0', url='https://github.com/zopefoundation/RestrictedPython', license='ZPL 2.1', description=( @@ -47,7 +47,6 @@ def read(*rnames): 'Programming Language :: Python', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', @@ -68,7 +67,7 @@ def read(*rnames): package_dir={'': 'src'}, install_requires=[ ], - python_requires=">=3.6, <3.12", + python_requires=">=3.7, <3.12", tests_require=tests_require, extras_require={ 'test': tests_require, diff --git a/src/RestrictedPython/_compat.py b/src/RestrictedPython/_compat.py index 690c535..d98805a 100644 --- a/src/RestrictedPython/_compat.py +++ b/src/RestrictedPython/_compat.py @@ -3,7 +3,6 @@ _version = sys.version_info -IS_PY37_OR_GREATER = _version.major == 3 and _version.minor >= 7 IS_PY38_OR_GREATER = _version.major == 3 and _version.minor >= 8 IS_PY310_OR_GREATER = _version.major == 3 and _version.minor >= 10 IS_PY311_OR_GREATER = _version.major == 3 and _version.minor >= 11 diff --git a/tox.ini b/tox.ini index 0e9f2d0..3be4255 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,6 @@ minversion = 3.18 envlist = lint - py36 py37 py38 py39 @@ -21,6 +20,7 @@ deps = datetime: DateTime -cconstraints.txt pytest-cov + Sphinx setenv = COVERAGE_FILE=.coverage.{envname} commands = @@ -47,7 +47,7 @@ commands = coverage combine coverage html coverage report -m --fail-under=100 -depends = py36,py37,py38,py39,py39-datetime,py310,py311,coverage +depends = py37,py38,py39,py39-datetime,py310,py311,py312coverage [testenv:lint] basepython = python3 @@ -90,6 +90,7 @@ deps = datetime: DateTime -cconstraints.txt pytest-cov + Sphinx setenv = COVERAGE_FILE=.coverage commands =