Prechádzať zdrojové kódy

support icalendar v6

Fabian Peter Hammerle 3 dní pred
rodič
commit
3613f1a8a9
4 zmenil súbory, kde vykonal 21 pridanie a 16 odobranie
  1. 6 3
      .github/workflows/python.yml
  2. 2 1
      CHANGELOG.md
  3. 12 11
      Pipfile.lock
  4. 1 1
      setup.py

+ 6 - 3
.github/workflows/python.yml

@@ -73,9 +73,12 @@ jobs:
         PYTHON_VERSION: ${{ matrix.python-version }}
     - run: pipenv run pylint tests
     - run: pipenv run mypy "$(cat *.egg-info/top_level.txt)" tests
-  tests-icalendar-v4:
+  tests-icalendar:
     runs-on: ubuntu-24.04
-    strategy: {matrix: {python-version: ['3.10']}}
+    strategy:
+      matrix:
+        python-version: ['3.10']
+        icalendar-version: ['4.1.2', '5.0.14']
     steps:
     - uses: actions/checkout@v6
     - uses: actions/setup-python@v6
@@ -83,7 +86,7 @@ jobs:
     - run: pip install --upgrade pipenv==2023.6.18
     - run: pipenv install --python "$PYTHON_VERSION" --deploy --dev
       env: {PYTHON_VERSION: '${{ matrix.python-version }}'}
-    - run: pipenv run pip install icalendar==4.1.2
+    - run: pipenv run pip install icalendar==${{ matrix.icalendar-version }}
     - run: pipenv graph
     - run: pipenv run pytest --cov="$(cat *.egg-info/top_level.txt)"
         --cov-report=term-missing --cov-fail-under=100

+ 2 - 1
CHANGELOG.md

@@ -6,7 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- support [icalendar](https://github.com/collective/icalendar/blob/main/CHANGES.rst) library v5
+- support [icalendar](https://github.com/collective/icalendar/blob/main/CHANGES.rst)
+  library v5 & v6
 
 ### Fixed
 - `_event_prop_equal`: fix "TypeError: object of type 'vDDDLists' has no len()"

+ 12 - 11
Pipfile.lock

@@ -22,11 +22,11 @@
         },
         "icalendar": {
             "hashes": [
-                "sha256:036dae6c027393b926c4a7c94a318a406e74d8bbf753e2b282b2bd443227c33b",
-                "sha256:7050ee71d5af55f84a9fef3ca3596da6453a80d26292c91cee7a49b1e08c5864"
+                "sha256:d400e9c9bb8c025e5a3c77c236941bb690494be52528a0b43cc7e8b7c9505064",
+                "sha256:e0c10ecbfcebe958d33af7d491f6e6b7580d11d475f2eeb29532d0424f9110a1"
             ],
-            "markers": "python_version >= '3.7'",
-            "version": "==5.0.14"
+            "markers": "python_version >= '3.8'",
+            "version": "==6.3.2"
         },
         "python-dateutil": {
             "hashes": [
@@ -36,13 +36,6 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==2.9.0.post0"
         },
-        "pytz": {
-            "hashes": [
-                "sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3",
-                "sha256:5ddf76296dd8c44c26eb8f4b6f35488f3ccbf6fbbd7adee0b7262d43f0ec2f00"
-            ],
-            "version": "==2025.2"
-        },
         "six": {
             "hashes": [
                 "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274",
@@ -50,6 +43,14 @@
             ],
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
             "version": "==1.17.0"
+        },
+        "tzdata": {
+            "hashes": [
+                "sha256:06a47e5700f3081aab02b2e513160914ff0694bce9947d6b76ebd6bf57cfc5d1",
+                "sha256:de39c2ca5dc7b0344f2eba86f49d614019d29f060fc4ebc8a417896a620b56a7"
+            ],
+            "markers": "python_version >= '2'",
+            "version": "==2025.3"
         }
     },
     "develop": {

+ 1 - 1
setup.py

@@ -55,7 +55,7 @@ setuptools.setup(
     },
     # >=3.9 type hint dict[…] (PEP585)
     python_requires=">=3.10",  # python<3.10 untested
-    install_requires=["icalendar>=4,<6"],
+    install_requires=["icalendar>=4,<7"],
     setup_requires=["setuptools_scm"],
     tests_require=["pytest"],
 )