Drops Poetry, switches to uv for package management

Author: sjoerdk

.github/workflows/build.yml

@@ -11,58 +11,46 @@ env:
   MINIMUM_PYTHON_VERSION: '3.10'
 
 jobs:
-
   precommit:
     runs-on: ubuntu-latest
     steps:
-      - name: Install Python ${{ env.MINIMUM_PYTHON_VERSION }}
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ env.MINIMUM_PYTHON_VERSION }}
-      - uses: actions/checkout@v3
-      - name: Install pre-commit
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install pre-commit virtualenv!=20.0.6
-          pre-commit install
       - name: Run static code inspections
-        run: pre-commit run --all-files
+        run: uv run pre-commit run --all-files
 
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
+      - name: Test with uv
         run: |
-          python -m pip install --upgrade pip
-          python -m pip install tox tox-gh-actions poetry
-      - name: Test with tox
-        run: |
-          tox
+          uv run pytest --cov-branch --cov-report term-missing --cov=tests/ --cov=midom/
   deploy:
     if: github.event_name == 'release'
     needs: [precommit, build]
     runs-on: ubuntu-latest
     steps:
-      - name: Install Python ${{ env.MINIMUM_PYTHON_VERSION }}
-        uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ env.MINIMUM_PYTHON_VERSION }}
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install poetry
       - name: Upload to pypi
         env:
-          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_PASSWORD }}
+          UV_PUBLISH_TOKEN: ${{ secrets.PYPI_PASSWORD }}
         run: |
-          poetry config http-basic.pypi "__token__" "${POETRY_PYPI_TOKEN_PYPI}"
-          poetry publish --build
+          uv build
+          uv publish

.gitignore

@@ -132,4 +132,5 @@ dmypy.json
 .idea/
 
 # This is a library, should just use newest always. Don't retrict
-poetry.lock
+poetry.lock
+uv.lock

.pre-commit-config.yaml

@@ -1,13 +1,11 @@
-default_language_version:
-  python: python3
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.0
+    rev: v2.37.3
     hooks:
       - id: pyupgrade
         language: python
         args: [--py36-plus]
-  - repo: https://github.com/ambv/black
+  - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
       - id: black
@@ -16,19 +14,19 @@ repos:
     rev: 5.0.4
     hooks:
       - id: flake8
-        exclude: dicomtrolley/xml_templates.py
         language: python
         additional_dependencies:
           - flake8-bugbear
+          - flake8-import-order
           - pep8-naming
           - flake8-docstrings
           - mccabe
           - yesqa
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v0.942'
+    rev: 'v1.16.1'
     hooks:
       - id: mypy
         additional_dependencies:
-          - "pydantic>=1.10.4"
+          - pydantic
           - types-requests
-          - types-Jinja2
+          - types-Jinja2

pyproject.toml

@@ -1,63 +1,42 @@
-[tool.poetry]
+[project]
 name = "dicomtrolley"
 version = "3.2.1"
 description = "Retrieve medical images via WADO-URI, WADO-RS, QIDO-RS, MINT, RAD69 and DICOM-QR"
 authors = ["sjoerdk <sjoerd.kerkstra@radboudumc.nl>"]
 readme = "README.md"
 license = "Apache-2.0"
 repository = "https://github.com/sjoerdk/dicomtrolley"
+requires-python = ">=3.10"
+dependencies = [
+    "requests",
+    "pydicom>=3.0.1",
+    "requests-futures>=1.0.0",
+    "pynetdicom",
+    "Jinja2",
+    "requests-toolbelt>=1.0.0",
+    "pydantic>=2"
+]
 
 [tool.black]
 line-length = 79
 target-version = ['py310']
 
-[tool.poetry.dependencies]
-python = ">=3.10"
-requests = "^2.32.5"
-pydicom = "3.0.1"
-requests-futures = ">=1.0.0"
-pynetdicom = "^3.0.4"
-Jinja2 = ">=3.0.3"
-requests-toolbelt = ">=1.0.0"
-pydantic = "^2.11.9"
-
-[tool.poetry.dev-dependencies]
-pytest = ">=7.4.0"
-pytest-randomly = ">=3.5.0"
-pytest-cov = ">=2.11.1"
-tox = ">=3.23.0"
-requests-mock = ">=1.11.0"
-factory-boy = ">=3.2.1"
-sybil = ">=5.0.3"
-mkdocs = ">=1.5.2"
-mkdocstrings = {extras = ["python"], version = ">=0.22.0"}
-mkdocs-gen-files = ">=0.5.0"
-mkdocs-section-index = ">=0.3.5"
-mkdocs-literate-nav = ">=0.6.0"
-markdown-mdantic = ">=1.3.5"
-mkdocs-material = ">=9.2.8"
-mkdocs-autorefs = ">=0.5.0"
-pip-tools = ">=7.3.0"
-
-
-[tool.tox]
-legacy_tox_ini = """
-[tox]
-isolated_build = True
-envlist = py310, py311, py312
-[gh-actions]
-python =
-    3.10: py310
-    3.11: py311
-    3.12: py312
-[testenv]
-allowlist_externals = poetry
-commands =
-    poetry install -v
-    poetry run pytest --cov=tests/ --cov=dicomtrolley/
-"""
-
-[build-system]
-requires = ["poetry-core>=1.0.8"]
-build-backend = "poetry.core.masonry.api"
-
+[dependency-groups]
+dev = [
+    "pytest>=7.4.0",
+    "pytest-randomly>=3.5.0",
+    "pytest-cov>=2.11.1",
+    "tox>=3.23.0",
+    "requests-mock>=1.11.0",
+    "factory-boy>=3.2.1",
+    "sybil>=5.0.3",
+    "mkdocs>=1.5.2",
+    "mkdocstrings>=0.22.0",
+    "mkdocs-gen-files>=0.5.0",
+    "mkdocs-section-index>=0.3.5",
+    "mkdocs-literate-nav>=0.6.0",
+    "markdown-mdantic>=1.3.5",
+    "mkdocs-material>=9.2.8",
+    "mkdocs-autorefs>=0.5.0",
+    "pip-tools>=7.3.0",
+]