Skip to content
Draft
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
2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ jobs:
config:
# [Python version, tox env]
- ["3.10", "lint", "ubuntu-latest"]
- ["3.8", "py38-unit", "ubuntu-latest"]
- ["3.9", "py39-unit", "ubuntu-latest"]
- ["3.10", "py310-unit", "ubuntu-latest"]
- ["3.11", "py311-unit", "ubuntu-latest"]
- ["3.12", "py312-unit", "ubuntu-latest"]
- ["3.13", "py313-unit", "ubuntu-latest"]
- ["3.8", "py38-integration", "ubuntu-latest"]
- ["3.9", "py39-integration", "ubuntu-latest"]
- ["3.10", "py310-integration", "ubuntu-latest"]
- ["3.11", "py311-integration", "ubuntu-latest"]
Expand Down
2 changes: 2 additions & 0 deletions news/36.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Restore support for Python 3.8.
[ale-rt]
5 changes: 4 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
[build-system]
requires = ["setuptools==75.8.0"]
requires = [
"setuptools==75.8.0; python_version > '3.8'",
"setuptools==74.0.0; python_version == '3.8'"
]

[tool.towncrier]
filename = "CHANGES.rst"
Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"Framework :: Plone",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Expand All @@ -44,10 +45,12 @@
package_dir={"": "src"},
include_package_data=True,
zip_safe=False,
python_requires=">=3.9",
python_requires=">=3.8",
install_requires=[
"importlib-metadata; python_version<'3.10'",
"importlib-resources; python_version<'3.9'",
"setuptools",
"setuptools <= 75.0; python_version<'3.9'",
"zope.configuration",
],
)
8 changes: 7 additions & 1 deletion src/plone/autoinclude/loader.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from importlib.metadata import distribution
from importlib.metadata import distributions
from importlib.metadata import PackageNotFoundError
from importlib.resources import files
from zope.configuration.xmlconfig import include
from zope.configuration.xmlconfig import includeOverrides

Expand All @@ -18,6 +17,13 @@
from importlib.metadata import entry_points


try:
from importlib.resources import files
except ImportError: # pragma: no cover
# Python 3.8
from importlib_resources import files


logger = logging.getLogger(__name__)

# Dictionary of project names and packages that we have already imported.
Expand Down
9 changes: 5 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
minversion = 3.18
envlist =
lint
py{39,310,311,312,313}-{integration,unit}
py{38,39,310,311,312,313}-{integration,unit}
buildout
coverage
# Not enabled by default:
Expand Down Expand Up @@ -56,15 +56,15 @@ integration_testpaths =
--test-path=test-packages/namespaceexample.native/src \
--test-path=test-packages/namespaceexample.pkgutilns/src

[testenv:py{39,310,311,312,313}-integration]
[testenv:py{38,39,310,311,312,313}-integration]
# Integration tests: run only the tests of the test packages.
# Do not run plone.autoinclude tests.
commands =
zope-testrunner {[testenv]integration_testpaths} []
extras =
test

[testenv:py{39,310,311,312,313}-unit]
[testenv:py{38,39,310,311,312,313}-unit]
usedevelop = true
skip_install = false
deps =
Expand Down Expand Up @@ -144,7 +144,8 @@ skip_install = true
setenv =
deps =
pip == 25.0.1
setuptools == 75.8.0
setuptools == 75.8.0; python_version >= '3.9'
setuptools == 74.0.0; python_version < '3.9'
zc.buildout == 4.0.0
commands_pre =
python -m pip list
Expand Down
Loading