-
-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Branch: refs/heads/master Date: 2025-01-06T20:55:15Z Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com> Commit: plone/plone.app.event@38429b3 [pre-commit.ci] pre-commit autoupdate updates: - [github.com/asottile/pyupgrade: v3.17.0 → v3.19.1](asottile/pyupgrade@v3.17.0...v3.19.1) - [github.com/mgedmin/check-manifest: 0.49 → 0.50](mgedmin/check-manifest@0.49...0.50) - [github.com/mgedmin/check-python-versions: 0.22.0 → 0.22.1](mgedmin/check-python-versions@0.22.0...0.22.1) Files changed: M .pre-commit-config.yaml Repository: plone.app.event Branch: refs/heads/master Date: 2025-01-23T16:27:16+01:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/plone.app.event@df32d3f Merge remote-tracking branch 'origin/pre-commit-ci-update-config' Files changed: M .pre-commit-config.yaml Repository: plone.app.event Branch: refs/heads/master Date: 2025-01-23T16:30:06+01:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/plone.app.event@2715143 update codespell Files changed: M .meta.toml M .pre-commit-config.yaml M pyproject.toml
- Loading branch information
1 parent
6d3d1db
commit d20ce96
Showing
1 changed file
with
31 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,37 +2,51 @@ Repository: plone.app.event | |
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2025-01-23T00:00:20+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.event/commit/e3f3e397135cb40f2409b84df4fd8d3a5335a766 | ||
| Date: 2025-01-06T20:55:15Z | ||
| Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com> | ||
| Commit: https://github.com/plone/plone.app.event/commit/38429b35111d9e5b075bbd9f18c78c06087a2c48 | ||
|
|
||
| Support `icalendar` 6 by forcing it to use its `pytz` timezone implementation. | ||
| [pre-commit.ci] pre-commit autoupdate | ||
|
|
||
| The new `zoneinfo` support in `icalendar` 6 does not work for us yet, giving indexing problems. | ||
| So we call `icalendar.use_pytz` at startup. | ||
| If this fails, we must be using an older version where `pytz` is the only option anyway, so we ignore this. | ||
| updates: | ||
| - [github.com/asottile/pyupgrade: v3.17.0 → v3.19.1](https://github.com/asottile/pyupgrade/compare/v3.17.0...v3.19.1) | ||
| - [github.com/mgedmin/check-manifest: 0.49 → 0.50](https://github.com/mgedmin/check-manifest/compare/0.49...0.50) | ||
| - [github.com/mgedmin/check-python-versions: 0.22.0 → 0.22.1](https://github.com/mgedmin/check-python-versions/compare/0.22.0...0.22.1) | ||
|
|
||
| Files changed: | ||
| A news/6.bugfix | ||
| M plone/app/event/__init__.py | ||
| M .pre-commit-config.yaml | ||
|
|
||
| b'diff --git a/news/6.bugfix b/news/6.bugfix\nnew file mode 100644\nindex 00000000..b000847d\n--- /dev/null\n+++ b/news/6.bugfix\n@@ -0,0 +1,5 @@\n+Support ``icalendar`` 6 by forcing it to use its ``pytz`` timezone implementation.\n+The new ``zoneinfo`` support in ``icalendar`` 6 does not work for us yet, giving indexing problems.\n+So we call ``icalendar.use_pytz`` at startup.\n+If this fails, we must be using an older version where ``pytz`` is the only option anyway, so we ignore this.\n+[maurits]\ndiff --git a/plone/app/event/__init__.py b/plone/app/event/__init__.py\nindex bac87e2c..62ed906e 100644\n--- a/plone/app/event/__init__.py\n+++ b/plone/app/event/__init__.py\n@@ -1,10 +1,27 @@\n from AccessControl.Permission import addPermission\n from zope.i18nmessageid import MessageFactory\n \n+import icalendar\n+import logging\n \n+\n+logger = logging.getLogger(__name__)\n packageName = __name__\n _ = MessageFactory("plone")\n \n+# We are not yet ready to use the standard zoneinfo implementation\n+# introduced in icalendar 6. For starters, the tests fail when\n+# Products.DateRecurringIndex.index.index_object is called:\n+# SystemError: <class \'BTrees.IIBTree.IISet\'> returned a result with an exception set\n+try:\n+ icalendar.use_pytz()\n+ logger.info("icalendar has been set up to use pytz instead of zoneinfo.")\n+except AttributeError:\n+ # If use_pytz does not exist, we either have an older icalender version\n+ # that only supports pytz anyway, or we have a newer version that no\n+ # longer supports it at all.\n+ pass\n+\n # BBB Permissions\n PORTAL_ADD_PERMISSION = "Add portal events" # CMFCalendar/ATCT permissions\n \n' | ||
| b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex f70417dc..18b75326 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -7,7 +7,7 @@ ci:\n \n repos:\n - repo: https://github.com/asottile/pyupgrade\n- rev: v3.17.0\n+ rev: v3.19.1\n hooks:\n - id: pyupgrade\n args: [--py38-plus]\n@@ -58,7 +58,7 @@ repos:\n # """\n ##\n - repo: https://github.com/mgedmin/check-manifest\n- rev: "0.49"\n+ rev: "0.50"\n hooks:\n - id: check-manifest\n - repo: https://github.com/regebro/pyroma\n@@ -66,7 +66,7 @@ repos:\n hooks:\n - id: pyroma\n - repo: https://github.com/mgedmin/check-python-versions\n- rev: "0.22.0"\n+ rev: "0.22.1"\n hooks:\n - id: check-python-versions\n args: [\'--only\', \'setup.py,pyproject.toml\']\n' | ||
|
|
||
| Repository: plone.app.event | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2025-01-23T11:01:02+01:00 | ||
| Date: 2025-01-23T16:27:16+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.event/commit/7985b0fd7a9f8a395fc4a9658548ce11b246520f | ||
| Commit: https://github.com/plone/plone.app.event/commit/df32d3ffbc6b5881d9a7ea105b2eb0ffe4816cb7 | ||
|
|
||
| Merge remote-tracking branch 'origin/pre-commit-ci-update-config' | ||
|
|
||
| Files changed: | ||
| M .pre-commit-config.yaml | ||
|
|
||
| b'diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex f70417dc..18b75326 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -7,7 +7,7 @@ ci:\n \n repos:\n - repo: https://github.com/asottile/pyupgrade\n- rev: v3.17.0\n+ rev: v3.19.1\n hooks:\n - id: pyupgrade\n args: [--py38-plus]\n@@ -58,7 +58,7 @@ repos:\n # """\n ##\n - repo: https://github.com/mgedmin/check-manifest\n- rev: "0.49"\n+ rev: "0.50"\n hooks:\n - id: check-manifest\n - repo: https://github.com/regebro/pyroma\n@@ -66,7 +66,7 @@ repos:\n hooks:\n - id: pyroma\n - repo: https://github.com/mgedmin/check-python-versions\n- rev: "0.22.0"\n+ rev: "0.22.1"\n hooks:\n - id: check-python-versions\n args: [\'--only\', \'setup.py,pyproject.toml\']\n' | ||
|
|
||
| Merge pull request #419 from plone/icalendar-6-pytz | ||
| Repository: plone.app.event | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2025-01-23T16:30:06+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.app.event/commit/271514391fbaf8429601587365e1a0c577e70bbd | ||
|
|
||
| Support icalendar 6 by forcing it to use pytz | ||
| update codespell | ||
|
|
||
| Files changed: | ||
| A news/6.bugfix | ||
| M plone/app/event/__init__.py | ||
| M .meta.toml | ||
| M .pre-commit-config.yaml | ||
| M pyproject.toml | ||
|
|
||
| b'diff --git a/news/6.bugfix b/news/6.bugfix\nnew file mode 100644\nindex 00000000..b000847d\n--- /dev/null\n+++ b/news/6.bugfix\n@@ -0,0 +1,5 @@\n+Support ``icalendar`` 6 by forcing it to use its ``pytz`` timezone implementation.\n+The new ``zoneinfo`` support in ``icalendar`` 6 does not work for us yet, giving indexing problems.\n+So we call ``icalendar.use_pytz`` at startup.\n+If this fails, we must be using an older version where ``pytz`` is the only option anyway, so we ignore this.\n+[maurits]\ndiff --git a/plone/app/event/__init__.py b/plone/app/event/__init__.py\nindex bac87e2c..62ed906e 100644\n--- a/plone/app/event/__init__.py\n+++ b/plone/app/event/__init__.py\n@@ -1,10 +1,27 @@\n from AccessControl.Permission import addPermission\n from zope.i18nmessageid import MessageFactory\n \n+import icalendar\n+import logging\n \n+\n+logger = logging.getLogger(__name__)\n packageName = __name__\n _ = MessageFactory("plone")\n \n+# We are not yet ready to use the standard zoneinfo implementation\n+# introduced in icalendar 6. For starters, the tests fail when\n+# Products.DateRecurringIndex.index.index_object is called:\n+# SystemError: <class \'BTrees.IIBTree.IISet\'> returned a result with an exception set\n+try:\n+ icalendar.use_pytz()\n+ logger.info("icalendar has been set up to use pytz instead of zoneinfo.")\n+except AttributeError:\n+ # If use_pytz does not exist, we either have an older icalender version\n+ # that only supports pytz anyway, or we have a newer version that no\n+ # longer supports it at all.\n+ pass\n+\n # BBB Permissions\n PORTAL_ADD_PERMISSION = "Add portal events" # CMFCalendar/ATCT permissions\n \n' | ||
| b'diff --git a/.meta.toml b/.meta.toml\nindex 2bc8a8da..8f9b2011 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -7,7 +7,7 @@ commit-id = "6e36bcc4"\n \n [pyproject]\n dependencies_ignores = "[\'plone.app.layout\', \'Products.DateRecurringIndex\']"\n-codespell_ignores = "discreet,assertin"\n+codespell_ignores = "discreet,assertin,thet"\n \n [flake8]\n extra_lines = """\ndiff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml\nindex 18b75326..87388ce3 100644\n--- a/.pre-commit-config.yaml\n+++ b/.pre-commit-config.yaml\n@@ -44,7 +44,7 @@ repos:\n # """\n ##\n - repo: https://github.com/codespell-project/codespell\n- rev: v2.3.0\n+ rev: v2.4.0\n hooks:\n - id: codespell\n additional_dependencies:\ndiff --git a/pyproject.toml b/pyproject.toml\nindex ade70135..f7a83d4c 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -71,7 +71,7 @@ target-version = ["py38"]\n ##\n \n [tool.codespell]\n-ignore-words-list = "discreet,assertin"\n+ignore-words-list = "discreet,assertin,thet"\n skip = "*.po,"\n ##\n # Add extra configuration options in .meta.toml:\n' | ||
|
|
||