Merge pull request #361 from jelmer/pyproject

Install dependencies from pyproject.toml, rather than listing in work…

.github/workflows/litmus.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip setuptools
-        pip install -U pip pycalendar vobject requests six tzlocal attrs aiohttp aiohttp-wsgi prometheus-client multidict pytest
+        pip install -U pip pycalendar vobject requests attrs aiohttp aiohttp-wsgi prometheus-client multidict pytest
         python setup.py develop
     - name: Run litmus tests
       run: |

.github/workflows/pycaldav.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
       fail-fast: false
 
     steps:
@@ -24,7 +24,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -U pip pycalendar vobject requests six tzlocal pytz attrs aiohttp aiohttp-wsgi prometheus-client multidict pytest "recurring-ical-events>=1.1.0b" typing-extensions defusedxml
+        pip install -U pip pycalendar vobject requests pytz attrs aiohttp aiohttp-wsgi prometheus-client multidict pytest "recurring-ical-events>=1.1.0b" typing-extensions defusedxml
         python -m pip install -e .
     - name: Run pycaldav tests
       run: |

.github/workflows/pythonpackage.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -U pip coverage codecov ruff pycalendar vobject requests six tzlocal attrs multidict pytest
+        pip install ".[dev,prometheus]"
     - name: Install dependencies (linux)
       run: |
         sudo apt -y update

pyproject.toml

@@ -35,6 +35,10 @@ dynamic = ["version"]
 [project.optional-dependencies]
 prometheus = ["aiohttp_openmetrics"]
 systemd = ["systemd_python"]
+dev = [
+   "ruff==0.7.0",
+   "pytest",
+]
 
 [project.scripts]
 xandikos = "xandikos.__main__:main"