PEP 735 compliance

Author: DimitriPapadopoulos

.github/workflows/merge-pytest.yml

@@ -53,7 +53,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: pip install .[tests]
+        run: pip install . --group tests
       - name: Test with pytest
         env:
           PYTHON_VERSION: ${{ matrix.python-version }}
@@ -86,7 +86,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: pip install .[tests]
+      run: pip install . --group tests
     - name: Switch to development pydicom
       run: |
         pip install git+https://github.com/pydicom/pydicom
@@ -121,7 +121,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        pip install -e .[tests]
+        pip install -e . --group tests
     - name: Test with pytest
       env:
         PYTHON_VERSION: ${{ matrix.python-version }}

.github/workflows/merge-typing.yml

@@ -22,7 +22,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: pip install .[dev]
+      run: pip install . --group dev
     - name: Run typing check with mypy
       run: |
         mypy

.github/workflows/pr-pytest-apps.yml

@@ -24,7 +24,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: pip install -e .[tests]
+      run: pip install -e . --group tests
     - name: Switch to development pydicom
       run: |
         pip install git+https://github.com/pydicom/pydicom
@@ -52,7 +52,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: pip install -e .[tests]
+      run: pip install -e . --group tests
     - name: Test with pytest
       env:
         PYTHON_VERSION: ${{ matrix.python-version }}

.github/workflows/pr-pytest.yml

@@ -56,7 +56,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
-        run: pip install -e .[tests]
+        run: pip install -e . --group tests
       - name: Get OpenSSL version
         run: |
           python -c "import ssl; print('OpenSSL:', ssl.OPENSSL_VERSION_INFO)"
@@ -89,7 +89,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: pip install -e .[tests]
+      run: pip install -e . --group tests
     - name: Switch to development pydicom
       run: |
         pip install git+https://github.com/pydicom/pydicom
@@ -122,7 +122,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        pip install -e .[tests]
+        pip install -e . --group tests
     - name: Get OpenSSL version
       run: |
         python -c "import ssl; print('OpenSSL:', ssl.OPENSSL_VERSION_INFO)"

.github/workflows/pr-type-lint-format.yml

@@ -22,7 +22,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: pip install -e .[dev]
+      run: pip install -e . --group dev
     - name: Run type check using mypy
       run: |
         mypy

CONTRIBUTING.md

@@ -60,7 +60,7 @@ Testing
 To install the test requirements use:
 
   ```bash
-  pip install -e .[tests]
+  pip install -e . --group tests
   ```
 
 Then to run the core tests:
@@ -78,7 +78,7 @@ Documentation
 To install the documentation build requirements use:
 
   ```bash
-  pip install -e .[docs]
+  pip install -e . --group docs
   ```
 
 To build the documentation run:

build_tools/circle/build_doc.sh

@@ -96,7 +96,7 @@ python3 -m venv venv
 . venv/bin/activate
 
 pip install -U pip
-pip install -e .[docs]
+pip install -e . --group docs
 
 # The pipefail is requested to propagate exit code
 set -o pipefail && cd docs && make $MAKE_TARGET 2>&1 | tee ~/log.txt

docs/user/installation.rst

@@ -52,7 +52,7 @@ in the activated environment change to the ``pynetdicom`` directory and install
 *pynetdicom* and the required development packages::
 
     cd pynetdicom/
-    python -m pip install -e .[dev]
+    python -m pip install -e . --group dev
 
 When you want to update your copy of the source code, run ``git pull`` from
 within the ``pynetdicom`` directory and Git will download and apply any

pyproject.toml

@@ -40,6 +40,19 @@ homepage = "https://github.com/pydicom/pynetdicom"
 
 [project.optional-dependencies]
 apps = ["sqlalchemy"]
+
+[project.scripts]
+echoscp = "pynetdicom.apps.echoscp.echoscp:main"
+echoscu = "pynetdicom.apps.echoscu.echoscu:main"
+findscu = "pynetdicom.apps.findscu.findscu:main"
+getscu = "pynetdicom.apps.getscu.getscu:main"
+movescu = "pynetdicom.apps.movescu.movescu:main"
+qrscp = "pynetdicom.apps.qrscp.qrscp:main"
+storescp = "pynetdicom.apps.storescp.storescp:main"
+storescu = "pynetdicom.apps.storescu.storescu:main"
+
+
+[dependency-groups]
 dev = [
     "asv >=0.6",
     "black >=23.1",
@@ -71,17 +84,6 @@ tests = [
 ]
 
 
-[project.scripts]
-echoscp = "pynetdicom.apps.echoscp.echoscp:main"
-echoscu = "pynetdicom.apps.echoscu.echoscu:main"
-findscu = "pynetdicom.apps.findscu.findscu:main"
-getscu = "pynetdicom.apps.getscu.getscu:main"
-movescu = "pynetdicom.apps.movescu.movescu:main"
-qrscp = "pynetdicom.apps.qrscp.qrscp:main"
-storescp = "pynetdicom.apps.storescp.storescp:main"
-storescu = "pynetdicom.apps.storescu.storescu:main"
-
-
 [tool.black]
 exclude = ".venv*|env*|build|/_.*_dict.py$"
 force-exclude = ".venv*|env*|/_.*_dict.py$"