Changing buildtool to uv

Author: chinacat567

.github/workflows/run_unit_tests.yml

@@ -16,7 +16,6 @@ jobs:
     strategy:
       matrix:
         python-version: [
-          "3.8",
           "3.9",
           "3.10",
           "3.11",
@@ -29,18 +28,16 @@ jobs:
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: ${{ matrix.python-version }} 
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
+      with:
+        version: "0.7.2"
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip setuptools
-        pip install '.[test]'
-        pip install .
+      run: uv sync
     - name: Lint with flake8
-      run: |
-        flake8 --exclude='bin,build,.eggs'
+      run: uv run flake8 src tests --exclude=.venv,build,.eggs  
     - name: Check type hints with mypy
-      run: |
-        mypy src tests
+      run: uv run mypy src tests
     - name: Test with pytest
-      run: |
-        pytest --cov=dicomweb_client --cov-fail-under=65 tests
+      run: uv run pytest --cov=pydicomweb_client --cov-fail-under=65 tests

pyproject.toml

@@ -1,20 +1,17 @@
-[build-system]
-requires = ["setuptools>=64"]
-build-backend = "setuptools.build_meta"
-
 [project]
-name = "dicomweb-client"
-version = "0.59.3"
+name = "pydicomweb-client"
+dynamic = ["version"]
 description = "Client for DICOMweb RESTful services."
 readme = "README.md"
-requires-python = ">=3.6"
+requires-python = ">=3.9"
 authors = [
     { name = "Markus D. Herrmann" },
+    { name = "Sumantra Sharma" },
+    { name = "Kai Schlamp" },
 ]
 maintainers = [
-    { name = "Markus D. Herrmann" },
-    { name = "Christopher P. Bridge" },
-    { name = "Steve Pieper" },
+    { name = "Sumantra Sharma" },
+    { name = "Kai Schlamp" },
 ]
 license = { text = "LICENSE" }
 classifiers = [
@@ -28,9 +25,6 @@ classifiers = [
     "Topic :: Multimedia :: Graphics",
     "Topic :: Scientific/Engineering :: Information Analysis",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -51,8 +45,11 @@ gcp = [
     "dataclasses>=0.8; python_version=='3.6'",
     "google-auth>=1.6",
 ]
-test = [
+
+[dependency-groups]
+dev = [
     "mypy==0.982",
+    "flake8==6.1.0",
     "pytest==7.1.3",
     "pytest-cov==3.0.0",
     "pytest-flake8==1.1.3",
@@ -69,12 +66,12 @@ docs = [
 ]
 
 [project.scripts]
-dicomweb_client = "dicomweb_client.cli:_main"
+pydicomweb_client = "pydicomweb_client.cli:_main"
 
 [project.urls]
-homepage = "https://github.com/imagingdatacommons/dicomweb-client"
+homepage = "https://github.com/openradx/pydicomweb"
 documentation = "https://dicomweb-client.readthedocs.io/"
-repository = "https://github.com/ImagingDataCommons/dicomweb-client.git"
+repository = "https://github.com/openradx/pydicomweb.git"
 
 [tool.pytest.ini_options]
 minversion = "7"
@@ -98,3 +95,13 @@ ignore_missing_imports = true
 [[tool.mypy.overrides]]
 module = "retrying.*"
 ignore_missing_imports = true
+
+[tool.uv-dynamic-versioning]
+pattern = "default-unprefixed"
+
+[tool.hatch.version]
+source = "uv-dynamic-versioning"
+
+[build-system]
+requires = ["hatchling", "uv-dynamic-versioning"]
+build-backend = "hatchling.build"

src/dicomweb_client/__init__.py

@@ -0,0 +1,14 @@
+__version__ = '0.59.3'
+
+from pydicomweb_client.api import DICOMwebClient, DICOMfileClient
+from pydicomweb_client.protocol import DICOMClient
+from pydicomweb_client.uri import URI, URISuffix, URIType
+
+__all__ = [
+    'DICOMClient',
+    'DICOMfileClient',
+    'DICOMwebClient',
+    'URI',
+    'URISuffix',
+    'URIType',
+]

src/dicomweb_client/api.py

@@ -0,0 +1,10 @@
+"""Application Programming Interface (API)"""
+from pydicomweb_client.web import DICOMwebClient
+from pydicomweb_client.file import DICOMfileClient
+from pydicomweb_client.protocol import DICOMClient
+
+__all__ = [
+    'DICOMClient',
+    'DICOMfileClient',
+    'DICOMwebClient',
+]

src/dicomweb_client/py.typed

@@ -11,9 +11,9 @@
 
 import pydicom
 
-from dicomweb_client.api import DICOMwebClient
-from dicomweb_client.log import configure_logging
-from dicomweb_client.session_utils import (
+from pydicomweb_client.api import DICOMwebClient
+from pydicomweb_client.log import configure_logging
+from pydicomweb_client.session_utils import (
     create_session,
     create_session_from_user_pass,
     add_certs_to_session,

src/pydicomweb_client/__init__.py

@@ -7,4 +7,4 @@
 For further details about GCP, visit: https://cloud.google.com
 """
 
-from dicomweb_client.ext.gcp.uri import GoogleCloudHealthcareURL  # noqa
+from pydicomweb_client.ext.gcp.uri import GoogleCloudHealthcareURL  # noqa