Skip to content

Commit

Permalink
Merge branch 'master' into maurits-test-long-event-master
Browse files Browse the repository at this point in the history
  • Loading branch information
jensens authored Oct 5, 2023
2 parents ac473af + e040c0e commit 9ff0aa9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ci:

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.8.0
rev: v3.10.1
hooks:
- id: pyupgrade
args: [--py38-plus]
Expand All @@ -16,7 +16,7 @@ repos:
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black
- repo: https://github.com/collective/zpretty
Expand All @@ -32,7 +32,7 @@ repos:
# """
##
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
- repo: https://github.com/codespell-project/codespell
Expand Down Expand Up @@ -63,7 +63,7 @@ repos:
- id: check-python-versions
args: ['--only', 'setup.py,pyproject.toml']
- repo: https://github.com/collective/i18ndude
rev: "6.0.0"
rev: "6.1.0"
hooks:
- id: i18ndude

Expand Down
5 changes: 5 additions & 0 deletions news/172.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Require setuptools 68.2 or higher for building the package.
When built with setuptools 68.1, you could not import the package, at least not an editable package.
Note that you can still *install* this package with older setuptools versions.
See `Plone meta issue 172 <https://github.com/plone/meta/issues/172>`_ for details.
[maurits]
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
# See the inline comments on how to expand/tweak this configuration file
[build-system]
requires = ["setuptools>=68.2", "wheel"]

[tool.towncrier]
directory = "news/"
filename = "CHANGES.rst"
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ deps =
build
z3c.dependencychecker==2.11
commands =
python -m build --sdist --no-isolation
python -m build --sdist
dependencychecker

[testenv:dependencies-graph]
Expand Down Expand Up @@ -125,7 +125,7 @@ commands =
# we build the change log as news entries might break
# the README that is displayed on PyPI
towncrier build --version=100.0.0 --yes
python -m build --sdist --no-isolation
python -m build --sdist
twine check dist/*

[testenv:circular]
Expand Down

0 comments on commit 9ff0aa9

Please sign in to comment.