Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop support for Python 3.6. #247

Merged
merged 1 commit into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
5 changes: 2 additions & 3 deletions .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
Expand Down
8 changes: 6 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand All @@ -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',
Expand All @@ -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,
Expand Down
1 change: 0 additions & 1 deletion src/RestrictedPython/_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
minversion = 3.18
envlist =
lint
py36
py37
py38
py39
Expand All @@ -21,6 +20,7 @@ deps =
datetime: DateTime
-cconstraints.txt
pytest-cov
Sphinx
setenv =
COVERAGE_FILE=.coverage.{envname}
commands =
Expand All @@ -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
Expand Down Expand Up @@ -90,6 +90,7 @@ deps =
datetime: DateTime
-cconstraints.txt
pytest-cov
Sphinx
setenv =
COVERAGE_FILE=.coverage
commands =
Expand Down