Merge pull request #311 from ImagingDataCommons/v0.24.0dev

WIP: V0.24.0dev

Author: CPBridge

.github/workflows/run_unit_tests.yml

@@ -7,15 +7,15 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches: [ "master", "v*dev" ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         dependencies: [".", "'.[libjpeg]'"]
 
     steps:

MANIFEST.in

@@ -83,10 +83,15 @@ def _create_modules(directory):
         except KeyError:
             logger.error(f'keyword not found for attribute "{tag}"')
             continue
+        try:
+            kw_path = [dictionary_keyword(t) for t in path]
+        except KeyError:
+            logger.error(f'keyword in path of attribute "{tag}" not found')
+            continue
         mapping = {
             'keyword': keyword,
             'type': item['type'],
-            'path': [dictionary_keyword(t) for t in path],
+            'path': kw_path,
         }
         modules[item['moduleId']].append(mapping)
     return modules

bin/create_iods_modules.py

@@ -13,6 +13,7 @@
 import os
 import sys
 import pkg_resources
+import datetime
 
 source_dir = os.path.dirname(__file__)
 pkg_dir = os.path.join(source_dir, '..', '..', 'src', 'highdicom')
@@ -21,7 +22,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'highdicom'
-copyright = '2020-2022, Herrmann Lab'
+copyright = f'2020-{datetime.datetime.now().year}, highdicom contributors'
 author = 'Markus D. Herrmann'
 
 # The full version, including alpha/beta/rc tags

data/test_files/seg_image_sm_control_labelmap.dcm

@@ -16,7 +16,7 @@ Requirements
 Installation
 ------------
 
-Pre-build package available at PyPi:
+Pre-built package available at PyPi:
 
 .. code-block:: none
 

data/test_files/seg_image_sm_control_labelmap_palette_color.dcm

@@ -75,6 +75,15 @@ highdicom.utils module
    :undoc-members:
    :show-inheritance:
 
+highdicom.pixels module
++++++++++++++++++++++++
+
+.. automodule:: highdicom.pixels
+   :members:
+   :inherited-members: pydicom.dataset.Dataset,pydicom.sequence.Sequence,Dataset,Sequence,list,str,DataElementSequence,enum.Enum,Enum,
+   :special-members: __call__
+   :undoc-members:
+   :show-inheritance:
 
 .. _highdicom-legacy-subpackage:
 

data/test_files/sm_image_control.dcm

@@ -447,7 +447,7 @@ segments. Note that passing a "label map" is purely a convenience provided by
 (`highdicom` splits the label map into multiple single-segment frames and
 stores these, as required by the standard).
 
-Therefore, The following snippet produces an equivalent SEG image to the
+Therefore, the following snippet produces an equivalent SEG image to the
 previous snippet, but passes the mask as a label map rather than as a stack of
 segments.