Skip to content

Commit 9ada64e

Browse files
author
Michael Howitz
authored
Drop support for Python 3.6. (#247)
1 parent 7f1a5c2 commit 9ada64e

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

.github/workflows/tests.yml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
config:
2323
# [Python version, tox env]
2424
- ["3.9", "lint"]
25-
- ["3.6", "py36"]
2625
- ["3.7", "py37"]
2726
- ["3.8", "py38"]
2827
- ["3.9", "py39"]

.meta.toml

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
# https://github.com/zopefoundation/meta/tree/master/config/pure-python
33
[meta]
44
template = "pure-python"
5-
commit-id = "200573eb414d2228d463da3de7d71a6d6335a704"
5+
commit-id = "c7a64084"
66

77
[python]
88
with-pypy = false
9-
with-legacy-python = false
109
with-docs = true
1110
with-sphinx-doctests = true
1211
with-windows = true
@@ -49,7 +48,7 @@ testenv-additional = [
4948
" coverage combine",
5049
" coverage html",
5150
" coverage report -m --fail-under=100",
52-
"depends = py36,py37,py38,py39,py39-datetime,py310,py311,coverage",
51+
"depends = py37,py38,py39,py39-datetime,py310,py311,py312coverage",
5352
]
5453
coverage-basepython = "python3.8"
5554
coverage-command = "pytest --cov=src --cov=tests --cov-report= {posargs}"

CHANGES.rst

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
Changes
22
=======
33

4-
6.1 (unreleased)
4+
7.0 (unreleased)
55
----------------
66

7-
- Nothing changed yet.
7+
Backwards incompatible changes
8+
++++++++++++++++++++++++++++++
9+
10+
- Drop support for Python 3.6.
11+
812

913

1014
6.0 (2022-11-03)

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ignore =
2424
force_single_line = True
2525
combine_as_imports = True
2626
sections = FUTURE,STDLIB,THIRDPARTY,ZOPE,FIRSTPARTY,LOCALFOLDER
27-
known_third_party = six, docutils, pkg_resources
27+
known_third_party = six, docutils, pkg_resources, pytz
2828
known_zope =
2929
known_first_party =
3030
default_section = ZOPE

setup.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def read(*rnames):
3232

3333
setup(
3434
name='RestrictedPython',
35-
version='6.1.dev0',
35+
version='7.0.dev0',
3636
url='https://github.com/zopefoundation/RestrictedPython',
3737
license='ZPL 2.1',
3838
description=(
@@ -47,7 +47,6 @@ def read(*rnames):
4747
'Programming Language :: Python',
4848
'Operating System :: OS Independent',
4949
'Programming Language :: Python :: 3',
50-
'Programming Language :: Python :: 3.6',
5150
'Programming Language :: Python :: 3.7',
5251
'Programming Language :: Python :: 3.8',
5352
'Programming Language :: Python :: 3.9',
@@ -68,7 +67,7 @@ def read(*rnames):
6867
package_dir={'': 'src'},
6968
install_requires=[
7069
],
71-
python_requires=">=3.6, <3.12",
70+
python_requires=">=3.7, <3.12",
7271
tests_require=tests_require,
7372
extras_require={
7473
'test': tests_require,

src/RestrictedPython/_compat.py

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44

55
_version = sys.version_info
6-
IS_PY37_OR_GREATER = _version.major == 3 and _version.minor >= 7
76
IS_PY38_OR_GREATER = _version.major == 3 and _version.minor >= 8
87
IS_PY310_OR_GREATER = _version.major == 3 and _version.minor >= 10
98
IS_PY311_OR_GREATER = _version.major == 3 and _version.minor >= 11

tox.ini

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
minversion = 3.18
55
envlist =
66
lint
7-
py36
87
py37
98
py38
109
py39
@@ -21,6 +20,7 @@ deps =
2120
datetime: DateTime
2221
-cconstraints.txt
2322
pytest-cov
23+
Sphinx
2424
setenv =
2525
COVERAGE_FILE=.coverage.{envname}
2626
commands =
@@ -47,7 +47,7 @@ commands =
4747
coverage combine
4848
coverage html
4949
coverage report -m --fail-under=100
50-
depends = py36,py37,py38,py39,py39-datetime,py310,py311,coverage
50+
depends = py37,py38,py39,py39-datetime,py310,py311,py312coverage
5151

5252
[testenv:lint]
5353
basepython = python3
@@ -90,6 +90,7 @@ deps =
9090
datetime: DateTime
9191
-cconstraints.txt
9292
pytest-cov
93+
Sphinx
9394
setenv =
9495
COVERAGE_FILE=.coverage
9596
commands =

0 commit comments

Comments
 (0)