Skip to content

Commit 9047a86

Browse files
authored
Merge branch 'main' into pylint
2 parents bb1ec6d + 34d4042 commit 9047a86

82 files changed

Lines changed: 254 additions & 306 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/merge-pytest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
python-version: ${{ matrix.python-version }}
5555
- name: Install dependencies
56-
run: pip install .[tests]
56+
run: pip install . --group tests
5757
- name: Test with pytest
5858
env:
5959
PYTHON_VERSION: ${{ matrix.python-version }}
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
python-version: ${{ matrix.python-version }}
8888
- name: Install dependencies
89-
run: pip install .[tests]
89+
run: pip install . --group tests
9090
- name: Switch to development pydicom
9191
run: |
9292
pip install git+https://github.com/pydicom/pydicom
@@ -121,7 +121,7 @@ jobs:
121121
python-version: ${{ matrix.python-version }}
122122
- name: Install dependencies
123123
run: |
124-
pip install -e .[tests]
124+
pip install -e . --group tests
125125
- name: Test with pytest
126126
env:
127127
PYTHON_VERSION: ${{ matrix.python-version }}

.github/workflows/merge-typing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
- name: Install dependencies
25-
run: pip install .[dev]
25+
run: pip install . --group dev
2626
- name: Run typing check with mypy
2727
run: |
2828
mypy

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
python-version: ${{ matrix.python-version }}
2626
- name: Install dependencies
27-
run: pip install -e .[tests]
27+
run: pip install -e . --group tests
2828
- name: Switch to development pydicom
2929
run: |
3030
pip install git+https://github.com/pydicom/pydicom
@@ -52,7 +52,7 @@ jobs:
5252
with:
5353
python-version: ${{ matrix.python-version }}
5454
- name: Install dependencies
55-
run: pip install -e .[tests]
55+
run: pip install -e . --group tests
5656
- name: Test with pytest
5757
env:
5858
PYTHON_VERSION: ${{ matrix.python-version }}

.github/workflows/pr-pytest.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
with:
5757
python-version: ${{ matrix.python-version }}
5858
- name: Install dependencies
59-
run: pip install -e .[tests]
59+
run: pip install -e . --group tests
6060
- name: Get OpenSSL version
6161
run: |
6262
python -c "import ssl; print('OpenSSL:', ssl.OPENSSL_VERSION_INFO)"
@@ -89,7 +89,7 @@ jobs:
8989
with:
9090
python-version: ${{ matrix.python-version }}
9191
- name: Install dependencies
92-
run: pip install -e .[tests]
92+
run: pip install -e . --group tests
9393
- name: Switch to development pydicom
9494
run: |
9595
pip install git+https://github.com/pydicom/pydicom
@@ -122,7 +122,7 @@ jobs:
122122
python-version: ${{ matrix.python-version }}
123123
- name: Install dependencies
124124
run: |
125-
pip install -e .[tests]
125+
pip install -e . --group tests
126126
- name: Get OpenSSL version
127127
run: |
128128
python -c "import ssl; print('OpenSSL:', ssl.OPENSSL_VERSION_INFO)"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ jobs:
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424
- name: Install dependencies
25-
run: pip install -e .[dev]
25+
run: pip install -e . --group dev
2626
- name: Run type check using mypy
2727
run: |
2828
mypy
29+
- name : Run linting check using ruff
30+
run: |
31+
ruff check
2932
- name: Run formatting check using black
3033
run: |
3134
black . --check
32-
- name : Run linting check using ruff
33-
run: |
34-
ruff check .
3535
- name: Run spell check using codespell
3636
run: |
3737
codespell -d pynetdicom

.github/workflows/publish-pypi-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
2929
- name: Upload artifacts
3030
if: ${{ success() }}
31-
uses: actions/upload-artifact@v6
31+
uses: actions/upload-artifact@v7
3232
with:
3333
name: wheels
3434
path: dist/
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Download the package files
48-
uses: actions/download-artifact@v7
48+
uses: actions/download-artifact@v8
4949
with:
5050
path: dist/
5151
merge-multiple: true

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Testing
6060
To install the test requirements use:
6161
6262
```bash
63-
pip install -e .[tests]
63+
pip install -e . --group tests
6464
```
6565
6666
Then to run the core tests:
@@ -78,7 +78,7 @@ Documentation
7878
To install the documentation build requirements use:
7979
8080
```bash
81-
pip install -e .[docs]
81+
pip install -e . --group docs
8282
```
8383
8484
To build the documentation run:

build_tools/circle/build_doc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ python3 -m venv venv
9696
. venv/bin/activate
9797

9898
pip install -U pip
99-
pip install -e .[docs]
99+
pip install -e . --group docs
100100

101101
# The pipefail is requested to propagate exit code
102102
set -o pipefail && cd docs && make $MAKE_TARGET 2>&1 | tee ~/log.txt

docs/user/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ in the activated environment change to the ``pynetdicom`` directory and install
5252
*pynetdicom* and the required development packages::
5353

5454
cd pynetdicom/
55-
python -m pip install -e .[dev]
55+
python -m pip install -e . --group dev
5656

5757
When you want to update your copy of the source code, run ``git pull`` from
5858
within the ``pynetdicom`` directory and Git will download and apply any

pynetdicom/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from ._version import __version__
99

10-
1110
# fmt: off
1211
# Update pydicom's UID dictionary with any missing transfer syntaxes
1312
UID_dictionary.update(
@@ -79,7 +78,6 @@
7978
)
8079
from pynetdicom.sop_class import register_uid
8180

82-
8381
# Setup default logging
8482
logging.getLogger(__name__).addHandler(logging.NullHandler())
8583

0 commit comments

Comments
 (0)