Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MRG] Add support for Inventory QR #887

Merged
merged 5 commits into from
Nov 17, 2023
Merged

[MRG] Add support for Inventory QR #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a546566
Add support for Inventory QR
scaramallion Nov 17, 2023
fa1dc42
Blacken
scaramallion Nov 17, 2023
ab42a8c
Merge branch 'main' into dev-inventory
scaramallion Nov 17, 2023
32097fb
Add coverage to poetry [tests]
scaramallion Nov 17, 2023
d71e4f4
Manually create coverage XML
scaramallion Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/merge-pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ jobs:
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v3
Expand Down Expand Up @@ -113,7 +114,8 @@ jobs:
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v3
Expand Down Expand Up @@ -156,7 +158,8 @@ jobs:
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v3
9 changes: 6 additions & 3 deletions .github/workflows/pr-pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ jobs:
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v3
Expand Down Expand Up @@ -113,7 +114,8 @@ jobs:
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v3
Expand Down Expand Up @@ -156,7 +158,8 @@ jobs:
env:
PYTHON_VERSION: ${{ matrix.python-version }}
run: |
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps
poetry run pytest --cov pynetdicom --ignore=pynetdicom/apps &&
poetry run coverage xml
- name: Send coverage results
if: ${{ success() }}
uses: codecov/codecov-action@v3
2 changes: 2 additions & 0 deletions docs/changelog/v2.1.0.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Enhancements
* Added support for *Repository Query* to
:meth:`~pynetdicom.association.Association.send_c_find` and
:class:`~pynetdicom.service_class.QueryRetrieveServiceClass` (:issue:`878`)
* Added support for :class:`Inventory Query/Retrieve Service Class
<pynetdicom.service_class.InventoryQueryRetrieveServiceClass>` (:issue:`879`)

Changes
.......
Expand Down
1 change: 1 addition & 0 deletions docs/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Supported Service Classes
* :doc:`Hanging Protocol Query/Retrieve <service_classes/hanging_protocol_service_class>`
* :doc:`Implant Template Query/Retrieve <service_classes/implant_template_service_class>`
* :doc:`Instance Availability Notification <service_classes/instance_availability>`
* :doc:`Inventory Query/Retrieve <service_classes/inventory_service_class>`
* :doc:`Media Creation Management <service_classes/media_creation>`
* :doc:`Non-Patient Object Storage <service_classes/non_patient_service_class>`
* :doc:`Print Management <service_classes/print_management>`
Expand Down
1 change: 1 addition & 0 deletions docs/reference/service_classes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pynetdicom supports the following Service Classes
DefinedProcedureProtocolQueryRetrieveServiceClass
HangingProtocolQueryRetrieveServiceClass
ImplantTemplateQueryRetrieveServiceClass
InventoryQueryRetrieveServiceClass
NonPatientObjectStorageServiceClass
ProtocolApprovalQueryRetrieveServiceClass
QueryRetrieveServiceClass
Expand Down
2 changes: 1 addition & 1 deletion docs/service_classes/basic_worklist_service_class.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Basic Worklist Management Service Statuses
+==================+==========+==============================================+
| 0xA700 | Failure | Out of resources |
+------------------+----------+----------------------------------------------+
| 0xA900 | Failure | Identifier does not match SOP Class |
| 0xA900 | Failure | Data Set does not match SOP Class |
+------------------+----------+----------------------------------------------+
| 0xC000 to 0xCFFF | Failure | Unable to process |
+------------------+----------+----------------------------------------------+
Expand Down
1 change: 1 addition & 0 deletions docs/service_classes/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Supported Service Classes
display_system_service_class
hanging_protocol_service_class
implant_template_service_class
inventory_service_class
instance_availability
media_creation
modality_performed_procedure_step
Expand Down
Loading