py-pydicom: updated to 2.2.1

Version 2.2.0

Changes

Data elements with a VR of AT must now be set with values acceptable to Tag(), and are always stored as a BaseTag. Previously, any Python type could be set.
BaseTag.__eq__() returns False rather than raising an exception when the operand cannot be converted to BaseTag
DA.__str__(), DT.__str__() and TM.__str__() return valid DICOM strings instead of the formatted date and time representations
If comparing FileDataset instances, the file metadata is now ignored. This makes it possible to compare a FileDataset object with a Dataset object.
rle_encode_frame() is deprecated and will be removed in v3.0, use compress() or RLELosslessEncoder instead.
read_file() is deprecated and will be removed in v3.0, use dcmread() instead.
write_file() is deprecated and will be removed in v3.0, use dcmwrite() instead.
Data dictionaries updated to version 2021b of the DICOM Standard
Dataset no longer inherits from dict

Enhancements

Added a command-line interface for pydicom. Current subcommands are:
show: display all or part of a DICOM file
codify to produce Python code for writing files or sequence items from scratch.
Please see the Command-line Interface Guide for examples and details of all the options for each command.
A field containing an invalid number of bytes will result in a warning instead of an exception when convert_wrong_length_to_UN is set to True.
Private tags known via the private dictionary will now get the configured VR if read from a dataset instead of UN
While reading explicit VR, a switch to implicit VR will be silently attempted if the VR bytes are not valid VR characters, and config option assume_implicit_vr_switch is True (default)
New functionality to help with correct formatting of decimal strings (DS)
Added is_valid_ds() to check whether a string is valid as a DICOM decimal string and format_number_as_ds() to format a given float or Decimal as a DS while retaining the highest possible level of precision
If enforce_valid_values is set to True, all DS objects created will be checked for the validity of their string representations.
Added optional auto_format parameter to the init methods of DSfloat and DSdecimal and the DS() factory function to allow explicitly requesting automatic formatting of the string representations of these objects when they are constructed.
Added methods to construct PersonName objects from individual components of names (family_name, given_name, etc.). See from_named_components() and from_named_components_veterinary().
Added support for downloading the large test files with the requests package in addition to urllib.request
Ensured convert_color_space() uses 32-bit floats for calculation, added per_frame flag to allow frame-by-frame processing and improved the speed by ~20-60%
Optimisations for RLE encoding using pydicom (~40% faster).
Added support for faster decoding (~4-5x) and encoding (~20x) of RLE Lossless Pixel Data via the pylibjpeg-rle plugin
Added Dataset.compress() function for compressing uncompressed pixel data using a given encoding format as specified by a UID. Only RLE Lossless is currently supported
Added encoders module and the following encoders:
RLELosslessEncoder with ‘pydicom’, ‘pylibjpeg’ and ‘gdcm’ plugins
Added read parameter to get_testdata_file() to allow reading and returning the corresponding dataset
Handle decoded RLE segments with padding
Add option to JSON functions to suppress exception and continue
Allow searching FileSet s for a list of elements
Added hash function to SR Code

Fixes

Fixed pickling a Dataset instance with sequences after the sequence had been read
Fixed JSON export of numeric values
Fixed handling of sequences of unknown length that switch to implicit encoding, and sequences with VR UN
Do not load external data sources until needed - fixes problems with standard workflow if setuptools are not installed
Fixed empty PN elements read from file being str rather than PersonName
Fixed handling of JPEG (10918-1) images compressed using RGB colourspace rather than YBR with the Pillow pixel data handler
Allow to deepcopy a ~pydicom.dataset.FileDataset object
Fixed elements with a VR of OL, OD and OV not being set correctly when an encoded backslash was part of the element value
Fixed expansion of linear segments with floating point steps in segmented LUTs
Fixed handling of code extensions with person name component delimiter
Fixed bug decoding RBG jpg with APP14 marker due to change in Pillow
Fixed decoding for FloatPixelData and DoubleFloatPixelData via pydicom.pixel_data_handlers.numpy_handler


Version 2.1.1

Fixes

Remove py.typed
Fix ImportError with Python 3.6.0
Fix converting Sequences with Bulk Data when loading from JSON


Version 2.1.0

Changelog

Dropped support for Python 3.5 (only Python 3.6+ supported)

Enhancements

Large testing data is no longer distributed within the pydicom package with the aim to reduce the package download size. These test files will download on-the-fly whenever either the tests are run, or should the file(s) be requested via the data manager functions. For example:
To download all files and get their paths on disk you can run pydicom.data.get_testdata_files().
To download an individual file and get its path on disk you can use pydicom.data.get_testdata_file(), e.g. for RG1_UNCI.dcm use pydicom.data.get_testdata_file("RG1_UNCI.dcm")
Added a new pixel data handler based on pylibjpeg which supports all (non-retired) JPEG transfer syntaxes
Added apply_rescale() alias
Added apply_voi() and apply_windowing()
Added prefer_lut keyword parameter to apply_voi_lut() and handle empty VOI LUT module elements
Added ability to register external data sources for use with the functions in pydicom.data
__contains__, __next__ and __iter__ implementations added to PersonName
Added convenience constants for the MPEG transfer syntaxes to pydicom.uid
Added support for decoding Waveform Data:
Added pydicom.waveforms module and generate_multiplex() and multiplex_array() functions.
Added Dataset.waveform_array() which returns an ndarray for the multiplex group at index within a Waveform Sequence element.
When JPEG 2000 image data is unsigned and the Pixel Representation is 1 the image data is converted to signed
Added keyword property for the new UID keywords in version 2020d of the DICOM Standard
Added testing of the variable names used when setting Dataset attributes and INVALID_KEYWORD_BEHAVIOR config option to allow customizing the behavior when a camel case variable name is used that isn’t a known element keyword
Added INVALID_KEY_BEHAVIOR config option to allow customizing the behavior when an invalid key is used with the Dataset in operator
Implemented full support (loading, accessing, modifying, writing) of DICOM File-sets and their DICOMDIR files via the FileSet class
Added AllTransferSyntaxes
Added option to turn on pydicom future breaking behavior to allow user code to check itself against the next major version release. Set environment variable “PYDICOM_FUTURE” to “True” or call future_behavior()
Added another signature to the bulk_data_uri_handler in from_json to allow for the communication of not just the URI but also the tag and VR to the handler. Previous handlers will work as expected, new signature handlers will get the additional information.
pack_bits() can now be used with 2D or 3D input arrays and will pad the packed data to even length by default.
Elements with the IS VR accept float strings that are convertible to integers without loss, e.g. “1.0”
Added encapsulate_extended() function for use when an Extended Offset Table is required

Changes

Reading and adding unknown non-private tags now does not raise an exception per default, only when enforce_valid_values is set
Data dictionaries updated to version 2020d of the DICOM Standard
Updated a handful of the SOP Class variable names in _storage_sopclass_uids to use the new UID keywords. Variables with Multiframe in them become MultiFrame, those with and in them become And, and DICOSQuadrupoleResonanceQRStorage becomes DICOSQuadrupoleResonanceStorage.
The following UID constants are deprecated and will be removed in v2.2:
JPEGBaseline: use JPEGBaseline8Bit
JPEGExtended: use JPEGExtended12Bit
JPEGLossless: use JPEGLosslessSV1
JPEGLSLossy: use JPEGLSNearLossless
JPEG2000MultiComponentLossless: use JPEG2000MCLossless
JPEG2000MultiComponent: use JPEG2000MC
In v3.0 the value for JPEGLossless will change from 1.2.840.10008.1.2.4.70 to 1.2.840.10008.1.2.4.57 to match its UID keyword
The following lists of UIDs are deprecated and will be removed in v2.2:
JPEGLossyCompressedPixelTransferSyntaxes: use JPEGTransferSyntaxes
JPEGLSSupportedCompressedPixelTransferSyntaxes: use JPEGLSTransferSyntaxes
JPEG2000CompressedPixelTransferSyntaxes: use JPEG2000TransferSyntaxes
RLECompressedLosslessSyntaxes: use RLETransferSyntaxes
UncompressedPixelTransferSyntaxes: use UncompressedTransferSyntaxes
PILSupportedCompressedPixelTransferSyntaxes
DicomDir and the dicomdir module are deprecated and will be removed in v3.0. Use FileSet instead
pydicom.overlay_data_handlers is deprecated, use pydicom.overlays instead
Removed transfer syntax limitations when converting overlays to an ndarray
The overlay_data_handlers config option is deprecated, the default handler will always be used.

Fixes

Dataset.copy() now works as expected
Optimistically parse undefined length non-SQ data as if it’s encapsulated pixel data to avoid erroring out on embedded sequence delimiter
Fixed get_testdata_file() and get_testdata_files() raising an exception if no network connection is available
Fixed GDCM < v2.8.8 not returning the pixel array for datasets not read from a file-like
Raise TypeError if dcmread() or dcmwrite() is called with wrong argument
Gracefully handle empty Specific Character Set
Fixed empty ambiguous VR elements raising an exception
Allow apply_voi_lut() to apply VOI lookup to an input float array
Fixed Dataset.setdefault() not adding working correctly when the default value is None and not adding private elements when enforce_valid_values is True

Version 2.0.0

Changelog

Dropped support for Python 2 (only Python 3.5+ supported)
Changes to Dataset.file_meta
file_meta now shown by default in dataset str or repr output; pydicom.config.show_file_meta can be set False to restore previous behavior
new FileMetaDataset class that accepts only group 2 data elements
Deprecation warning given unless Dataset.file_meta set with a FileMetaDataset object (in pydicom 3, it will be required)
Old PersonName class removed; PersonName3 renamed to PersonName. Classes PersonNameUnicode and PersonName3 are aliased to PersonName but are deprecated and will be removed in version 2.1
dataelem.isMultiValue (previously deprecated) has been removed. Use dataelem.DataElement.VM instead.

Enhancements

Allow PathLike objects for filename argument in dcmread, dcmwrite and Dataset.save_as
Deflate post-file meta information data when writing a dataset with the Deflated Explicit VR Little Endian transfer syntax UID
Added config.replace_un_with_known_vr to be able to switch off automatic VR conversion for known tags with VR “UN”
Added config.use_DS_numpy and config.use_IS_numpy to have multi-valued data elements with VR of DS or IS return a numpy array

Fixes

Fixed reading of datasets with an empty Specific Character Set tag
Fixed failure to parse dataset with an empty LUT Descriptor or Red/Green/Blue Palette Color LUT Descriptor element.
Made Dataset.save_as a wrapper for dcmwrite
Removed 1.2.840.10008.1.2.4.70 - JPEG Lossless (Process 14, SV1) from the Pillow pixel data handler as Pillow doesn’t support JPEG Lossless.
Fixed error when writing elements with a VR of OF
Fixed improper conversion when reading elements with a VR of OF
Fixed apply_voi_lut() and apply_modality_lut() not handling (0028,3006) LUT Data with a VR of OW
Fixed access to private creator tag in raw datasets
Fixed description of newly added known private tag
Fixed update of private blocks after deleting private creator
Fixed bug in updating pydicom.config.use_DS_Decimal flag in DS_decimal()

3 files changed, 313 insertions, 197 deletions

diff --git a/biology/py-pydicom/Makefile b/biology/py-pydicom/Makefile
index 8b9eec30f2d..cbc9c009010 100644
--- a/biology/py-pydicom/Makefile
+++ b/biology/py-pydicom/Makefile
@@ -1,29 +1,24 @@
-# $NetBSD: Makefile,v 1.3 2019/10/01 14:45:29 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/08/29 12:59:39 adam Exp $
 
-DISTNAME=	pydicom-1.3.0
+DISTNAME=	pydicom-2.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	biology python
-MASTER_SITES=	${MASTER_SITE_GITHUB:=pydicom/}
-GITHUB_PROJECT=	pydicom
-GITHUB_TAG=	v${PKGVERSION_NOREV}
+MASTER_SITES=	${MASTER_SITE_PYPI:=p/pydicom/}
 
 MAINTAINER=	eborisch@gmail.com
-HOMEPAGE=	https://github.com/pydicom/pydicom/
+HOMEPAGE=	https://github.com/pydicom/pydicom
 COMMENT=	Pure python package for working with DICOM files
 LICENSE=	modified-bsd AND mit
 
-USE_LANGUAGES=	# none
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
 
-DOCDIR=			share/doc/${PKGBASE}
-PLIST_SUBST+=		DOCDIR=${DOCDIR:Q}
-INSTALLATION_DIRS+=	${DOCDIR}
+USE_LANGUAGES=	# none
 
-post-extract:
-	${CHMOD} a-x ${WRKSRC}/pydicom/data/test_files/*.dcm
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/${DOCDIR}
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} pydicom pydicom-${PYVERSSUFFIX} || ${TRUE}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/biology/py-pydicom/PLIST b/biology/py-pydicom/PLIST
index 260298473f2..53276cd7eb3 100644
--- a/biology/py-pydicom/PLIST
+++ b/biology/py-pydicom/PLIST
@@ -1,39 +1,75 @@
-@comment $NetBSD: PLIST,v 1.2 2019/10/01 14:45:29 nia Exp $
-${PYSITELIB}/dicom.py
-${PYSITELIB}/dicom.pyc
-${PYSITELIB}/dicom.pyo
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+@comment $NetBSD: PLIST,v 1.3 2021/08/29 12:59:39 adam Exp $
+bin/pydicom-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/dicom.py
+${PYSITELIB}/dicom.pyc
+${PYSITELIB}/dicom.pyo
+${PYSITELIB}/pydicom/__init__.py
+${PYSITELIB}/pydicom/__init__.pyc
+${PYSITELIB}/pydicom/__init__.pyo
+${PYSITELIB}/pydicom/_dicom_dict.py
+${PYSITELIB}/pydicom/_dicom_dict.pyc
+${PYSITELIB}/pydicom/_dicom_dict.pyo
+${PYSITELIB}/pydicom/_private_dict.py
+${PYSITELIB}/pydicom/_private_dict.pyc
+${PYSITELIB}/pydicom/_private_dict.pyo
+${PYSITELIB}/pydicom/_storage_sopclass_uids.py
+${PYSITELIB}/pydicom/_storage_sopclass_uids.pyc
+${PYSITELIB}/pydicom/_storage_sopclass_uids.pyo
+${PYSITELIB}/pydicom/_uid_dict.py
+${PYSITELIB}/pydicom/_uid_dict.pyc
+${PYSITELIB}/pydicom/_uid_dict.pyo
+${PYSITELIB}/pydicom/_version.py
+${PYSITELIB}/pydicom/_version.pyc
+${PYSITELIB}/pydicom/_version.pyo
+${PYSITELIB}/pydicom/benchmarks/__init__.py
+${PYSITELIB}/pydicom/benchmarks/__init__.pyc
+${PYSITELIB}/pydicom/benchmarks/__init__.pyo
 ${PYSITELIB}/pydicom/benchmarks/bench_encaps.py
 ${PYSITELIB}/pydicom/benchmarks/bench_encaps.pyc
 ${PYSITELIB}/pydicom/benchmarks/bench_encaps.pyo
 ${PYSITELIB}/pydicom/benchmarks/bench_handler_numpy.py
 ${PYSITELIB}/pydicom/benchmarks/bench_handler_numpy.pyc
 ${PYSITELIB}/pydicom/benchmarks/bench_handler_numpy.pyo
-${PYSITELIB}/pydicom/benchmarks/bench_handler_rle_decode.py
-${PYSITELIB}/pydicom/benchmarks/bench_handler_rle_decode.pyc
-${PYSITELIB}/pydicom/benchmarks/bench_handler_rle_decode.pyo
-${PYSITELIB}/pydicom/benchmarks/bench_handler_rle_encode.py
-${PYSITELIB}/pydicom/benchmarks/bench_handler_rle_encode.pyc
-${PYSITELIB}/pydicom/benchmarks/bench_handler_rle_encode.pyo
-${PYSITELIB}/pydicom/benchmarks/__init__.py
-${PYSITELIB}/pydicom/benchmarks/__init__.pyc
-${PYSITELIB}/pydicom/benchmarks/__init__.pyo
+${PYSITELIB}/pydicom/benchmarks/bench_pixel_util.py
+${PYSITELIB}/pydicom/benchmarks/bench_pixel_util.pyc
+${PYSITELIB}/pydicom/benchmarks/bench_pixel_util.pyo
+${PYSITELIB}/pydicom/benchmarks/bench_rle_decode.py
+${PYSITELIB}/pydicom/benchmarks/bench_rle_decode.pyc
+${PYSITELIB}/pydicom/benchmarks/bench_rle_decode.pyo
+${PYSITELIB}/pydicom/benchmarks/bench_rle_encode.py
+${PYSITELIB}/pydicom/benchmarks/bench_rle_encode.pyc
+${PYSITELIB}/pydicom/benchmarks/bench_rle_encode.pyo
 ${PYSITELIB}/pydicom/charset.py
 ${PYSITELIB}/pydicom/charset.pyc
 ${PYSITELIB}/pydicom/charset.pyo
+${PYSITELIB}/pydicom/cli/__init__.py
+${PYSITELIB}/pydicom/cli/__init__.pyc
+${PYSITELIB}/pydicom/cli/__init__.pyo
+${PYSITELIB}/pydicom/cli/codify.py
+${PYSITELIB}/pydicom/cli/codify.pyc
+${PYSITELIB}/pydicom/cli/codify.pyo
+${PYSITELIB}/pydicom/cli/main.py
+${PYSITELIB}/pydicom/cli/main.pyc
+${PYSITELIB}/pydicom/cli/main.pyo
+${PYSITELIB}/pydicom/cli/show.py
+${PYSITELIB}/pydicom/cli/show.pyc
+${PYSITELIB}/pydicom/cli/show.pyo
 ${PYSITELIB}/pydicom/compat.py
 ${PYSITELIB}/pydicom/compat.pyc
 ${PYSITELIB}/pydicom/compat.pyo
 ${PYSITELIB}/pydicom/config.py
 ${PYSITELIB}/pydicom/config.pyc
 ${PYSITELIB}/pydicom/config.pyo
-${PYSITELIB}/pydicom/data/charset_files/charlist.py
-${PYSITELIB}/pydicom/data/charset_files/charlist.pyc
-${PYSITELIB}/pydicom/data/charset_files/charlist.pyo
+${PYSITELIB}/pydicom/data/__init__.py
+${PYSITELIB}/pydicom/data/__init__.pyc
+${PYSITELIB}/pydicom/data/__init__.pyo
+${PYSITELIB}/pydicom/data/charset_files/FileInfo.txt
 ${PYSITELIB}/pydicom/data/charset_files/chrArab.dcm
 ${PYSITELIB}/pydicom/data/charset_files/chrFren.dcm
 ${PYSITELIB}/pydicom/data/charset_files/chrFrenMulti.dcm
@@ -47,34 +83,70 @@ ${PYSITELIB}/pydicom/data/charset_files/chrJapMulti.dcm
 ${PYSITELIB}/pydicom/data/charset_files/chrJapMultiExplicitIR6.dcm
 ${PYSITELIB}/pydicom/data/charset_files/chrKoreanMulti.dcm
 ${PYSITELIB}/pydicom/data/charset_files/chrRuss.dcm
-${PYSITELIB}/pydicom/data/charset_files/chrSQEncoding1.dcm
 ${PYSITELIB}/pydicom/data/charset_files/chrSQEncoding.dcm
+${PYSITELIB}/pydicom/data/charset_files/chrSQEncoding1.dcm
 ${PYSITELIB}/pydicom/data/charset_files/chrX1.dcm
 ${PYSITELIB}/pydicom/data/charset_files/chrX2.dcm
-${PYSITELIB}/pydicom/data/charset_files/FileInfo.txt
-${PYSITELIB}/pydicom/data/charset_files/__init__.py
-${PYSITELIB}/pydicom/data/charset_files/__init__.pyc
-${PYSITELIB}/pydicom/data/charset_files/__init__.pyo
 ${PYSITELIB}/pydicom/data/data_manager.py
 ${PYSITELIB}/pydicom/data/data_manager.pyc
 ${PYSITELIB}/pydicom/data/data_manager.pyo
-${PYSITELIB}/pydicom/datadict.py
-${PYSITELIB}/pydicom/datadict.pyc
-${PYSITELIB}/pydicom/datadict.pyo
-${PYSITELIB}/pydicom/dataelem.py
-${PYSITELIB}/pydicom/dataelem.pyc
-${PYSITELIB}/pydicom/dataelem.pyo
-${PYSITELIB}/pydicom/data/__init__.py
-${PYSITELIB}/pydicom/data/__init__.pyc
-${PYSITELIB}/pydicom/data/__init__.pyo
-${PYSITELIB}/pydicom/dataset.py
-${PYSITELIB}/pydicom/dataset.pyc
-${PYSITELIB}/pydicom/dataset.pyo
-${PYSITELIB}/pydicom/data/test_files/badVR.dcm
-${PYSITELIB}/pydicom/data/test_files/color3d_jpeg_baseline.dcm
-${PYSITELIB}/pydicom/data/test_files/color-pl.dcm
-${PYSITELIB}/pydicom/data/test_files/color-px.dcm
+${PYSITELIB}/pydicom/data/download.py
+${PYSITELIB}/pydicom/data/download.pyc
+${PYSITELIB}/pydicom/data/download.pyo
+${PYSITELIB}/pydicom/data/hashes.json
+${PYSITELIB}/pydicom/data/palettes/README.md
+${PYSITELIB}/pydicom/data/palettes/fall.dcm
+${PYSITELIB}/pydicom/data/palettes/hotiron.dcm
+${PYSITELIB}/pydicom/data/palettes/hotmetalblue.dcm
+${PYSITELIB}/pydicom/data/palettes/pet.dcm
+${PYSITELIB}/pydicom/data/palettes/pet20step.dcm
+${PYSITELIB}/pydicom/data/palettes/spring.dcm
+${PYSITELIB}/pydicom/data/palettes/summer.dcm
+${PYSITELIB}/pydicom/data/palettes/winter.dcm
+${PYSITELIB}/pydicom/data/retry.py
+${PYSITELIB}/pydicom/data/retry.pyc
+${PYSITELIB}/pydicom/data/retry.pyo
+${PYSITELIB}/pydicom/data/test_files/693_J2KI.dcm
 ${PYSITELIB}/pydicom/data/test_files/CT_small.dcm
+${PYSITELIB}/pydicom/data/test_files/ExplVR_BigEnd.dcm
+${PYSITELIB}/pydicom/data/test_files/ExplVR_BigEndNoMeta.dcm
+${PYSITELIB}/pydicom/data/test_files/ExplVR_LitEndNoMeta.dcm
+${PYSITELIB}/pydicom/data/test_files/GDCMJ2K_TextGBR.dcm
+${PYSITELIB}/pydicom/data/test_files/J2K_pixelrep_mismatch.dcm
+${PYSITELIB}/pydicom/data/test_files/JPEG-lossy.dcm
+${PYSITELIB}/pydicom/data/test_files/JPEG2000-embedded-sequence-delimiter.dcm
+${PYSITELIB}/pydicom/data/test_files/JPEG2000.dcm
+${PYSITELIB}/pydicom/data/test_files/JPGExtended.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_small.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_small_RLE.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_small_bigendian.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_small_expb.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_small_implicit.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_small_jp2klossless.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_small_jpeg_ls_lossless.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_small_padded.dcm
+${PYSITELIB}/pydicom/data/test_files/MR_truncated.dcm
+${PYSITELIB}/pydicom/data/test_files/README.txt
+${PYSITELIB}/pydicom/data/test_files/SC_jpeg_no_color_transform.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_jpeg_no_color_transform_2.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_gdcm_KY.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg_app14_dcmd.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg_dcmd.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg_dcmtk.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg_gdcm.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg_lossy_gdcm.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_16bit.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_16bit_2frame.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_2frame.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_32bit.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_32bit_2frame.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_small_odd.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_rgb_small_odd_jpeg.dcm
+${PYSITELIB}/pydicom/data/test_files/SC_ybr_full_422_uncompressed.dcm
+${PYSITELIB}/pydicom/data/test_files/UN_sequence.dcm
+${PYSITELIB}/pydicom/data/test_files/badVR.dcm
 ${PYSITELIB}/pydicom/data/test_files/dicomdirtests/77654033/CR1/6154
 ${PYSITELIB}/pydicom/data/test_files/dicomdirtests/77654033/CR2/6247
 ${PYSITELIB}/pydicom/data/test_files/dicomdirtests/77654033/CR3/6278
@@ -107,112 +179,102 @@ ${PYSITELIB}/pydicom/data/test_files/dicomdirtests/98892003/MR700/4618
 ${PYSITELIB}/pydicom/data/test_files/dicomdirtests/98892003/MR700/4648
 ${PYSITELIB}/pydicom/data/test_files/dicomdirtests/98892003/MR700/4678
 ${PYSITELIB}/pydicom/data/test_files/dicomdirtests/DICOMDIR
-${PYSITELIB}/pydicom/data/test_files/emri_small_big_endian.dcm
-${PYSITELIB}/pydicom/data/test_files/emri_small.dcm
-${PYSITELIB}/pydicom/data/test_files/emri_small_jpeg_2k_lossless.dcm
-${PYSITELIB}/pydicom/data/test_files/emri_small_jpeg_ls_lossless.dcm
-${PYSITELIB}/pydicom/data/test_files/emri_small_RLE.dcm
-${PYSITELIB}/pydicom/data/test_files/ExplVR_BigEnd.dcm
-${PYSITELIB}/pydicom/data/test_files/ExplVR_BigEndNoMeta.dcm
-${PYSITELIB}/pydicom/data/test_files/ExplVR_LitEndNoMeta.dcm
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/DICOMDIR-bigEnd
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/DICOMDIR-empty.dcm
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/DICOMDIR-implicit
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/DICOMDIR-nooffset
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/DICOMDIR-nopatient
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/DICOMDIR-reordered
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/README.txt
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/DICOMDIR
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000000
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000001
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000002
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000003
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000004
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000005
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000006
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000007
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000008
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000009
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000A
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000B
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000C
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000D
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000E
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000F
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000G
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000H
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000I
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000J
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000K
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000L
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000M
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000N
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000O
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000P
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000Q
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000R
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000S
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000T
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000U
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000V
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000W
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000X
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000Y
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00000Z
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000010
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000011
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000012
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000013
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000014
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000015
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000016
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000017
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000018
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM000019
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00001A
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00001B
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00001C
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/PT000000/ST000000/SE000000/IM00001D
+${PYSITELIB}/pydicom/data/test_files/dicomdirtests/tiny_alpha/README
+${PYSITELIB}/pydicom/data/test_files/empty_charset_LEI.dcm
 ${PYSITELIB}/pydicom/data/test_files/image_dfl.dcm
-${PYSITELIB}/pydicom/data/test_files/__init__.py
-${PYSITELIB}/pydicom/data/test_files/__init__.pyc
-${PYSITELIB}/pydicom/data/test_files/__init__.pyo
-${PYSITELIB}/pydicom/data/test_files/JPEG2000.dcm
-${PYSITELIB}/pydicom/data/test_files/JPEG-LL.dcm
-${PYSITELIB}/pydicom/data/test_files/JPEG-lossy.dcm
 ${PYSITELIB}/pydicom/data/test_files/liver_1frame.dcm
-${PYSITELIB}/pydicom/data/test_files/liver.dcm
 ${PYSITELIB}/pydicom/data/test_files/liver_expb_1frame.dcm
-${PYSITELIB}/pydicom/data/test_files/liver_expb.dcm
 ${PYSITELIB}/pydicom/data/test_files/meta_missing_tsyntax.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_small_bigendian.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_small.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_small_expb.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_small_implicit.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_small_jp2klossless.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_small_jpeg_ls_lossless.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_small_padded.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_small_RLE.dcm
-${PYSITELIB}/pydicom/data/test_files/MR_truncated.dcm
 ${PYSITELIB}/pydicom/data/test_files/nested_priv_SQ.dcm
+${PYSITELIB}/pydicom/data/test_files/no_meta.dcm
 ${PYSITELIB}/pydicom/data/test_files/no_meta_group_length.dcm
-${PYSITELIB}/pydicom/data/test_files/OBXXXX1A_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/OBXXXX1A.dcm
-${PYSITELIB}/pydicom/data/test_files/OBXXXX1A_expb_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/OBXXXX1A_expb.dcm
-${PYSITELIB}/pydicom/data/test_files/OBXXXX1A_rle_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/OBXXXX1A_rle.dcm
-${PYSITELIB}/pydicom/data/test_files/OT-PAL-8-face.dcm
 ${PYSITELIB}/pydicom/data/test_files/priv_SQ.dcm
-${PYSITELIB}/pydicom/data/test_files/README.txt
 ${PYSITELIB}/pydicom/data/test_files/reportsi.dcm
 ${PYSITELIB}/pydicom/data/test_files/reportsi_with_empty_number_tags.dcm
-${PYSITELIB}/pydicom/data/test_files/rtdose_1frame.dcm
 ${PYSITELIB}/pydicom/data/test_files/rtdose.dcm
-${PYSITELIB}/pydicom/data/test_files/rtdose_expb_1frame.dcm
+${PYSITELIB}/pydicom/data/test_files/rtdose_1frame.dcm
 ${PYSITELIB}/pydicom/data/test_files/rtdose_expb.dcm
-${PYSITELIB}/pydicom/data/test_files/rtdose_rle_1frame.dcm
+${PYSITELIB}/pydicom/data/test_files/rtdose_expb_1frame.dcm
 ${PYSITELIB}/pydicom/data/test_files/rtdose_rle.dcm
+${PYSITELIB}/pydicom/data/test_files/rtdose_rle_1frame.dcm
 ${PYSITELIB}/pydicom/data/test_files/rtplan.dcm
 ${PYSITELIB}/pydicom/data/test_files/rtplan.dump
 ${PYSITELIB}/pydicom/data/test_files/rtplan_truncated.dcm
 ${PYSITELIB}/pydicom/data/test_files/rtstruct.dcm
 ${PYSITELIB}/pydicom/data/test_files/rtstruct.dump
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_16bit_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_16bit.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_32bit_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_32bit.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_+eb+cr.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_ebcr_dcmd.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_+eb+cy+n1.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_ebcyn1_dcmd.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_+eb+cy+n2.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_ebcyn2_dcmd.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_+eb+cy+np.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_ebcynp_dcmd.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_+eb+cy+s2.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_ebcys2_dcmd.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_+eb+cy+s4.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_dcmtk_ebcys4_dcmd.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_expb_16bit_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_expb_16bit.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_expb_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_expb_32bit_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_expb_32bit.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_expb.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_gdcm2k_uncompressed.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_gdcm_KY.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg_dcmtk.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg_gdcm.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_jpeg_lossy_gdcm.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_16bit_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_16bit.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_32bit_2frame.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle_32bit.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_rle.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_small_odd.dcm
-${PYSITELIB}/pydicom/data/test_files/SC_rgb_small_odd_jpeg.dcm
+${PYSITELIB}/pydicom/data/test_files/test-SR.dcm
 ${PYSITELIB}/pydicom/data/test_files/test1.json
 ${PYSITELIB}/pydicom/data/test_files/test_PN.json
-${PYSITELIB}/pydicom/data/test_files/test.py
-${PYSITELIB}/pydicom/data/test_files/test.pyc
-${PYSITELIB}/pydicom/data/test_files/test.pyo
-${PYSITELIB}/pydicom/data/test_files/test-SR.dcm
+${PYSITELIB}/pydicom/data/test_files/waveform_ecg.dcm
 ${PYSITELIB}/pydicom/data/test_files/zipMR.gz
-${PYSITELIB}/pydicom/data/tests/__init__.py
-${PYSITELIB}/pydicom/data/tests/__init__.pyc
-${PYSITELIB}/pydicom/data/tests/__init__.pyo
-${PYSITELIB}/pydicom/data/tests/test_data_manager.py
-${PYSITELIB}/pydicom/data/tests/test_data_manager.pyc
-${PYSITELIB}/pydicom/data/tests/test_data_manager.pyo
-${PYSITELIB}/pydicom/_dicom_dict.py
-${PYSITELIB}/pydicom/_dicom_dict.pyc
-${PYSITELIB}/pydicom/_dicom_dict.pyo
+${PYSITELIB}/pydicom/data/urls.json
+${PYSITELIB}/pydicom/datadict.py
+${PYSITELIB}/pydicom/datadict.pyc
+${PYSITELIB}/pydicom/datadict.pyo
+${PYSITELIB}/pydicom/dataelem.py
+${PYSITELIB}/pydicom/dataelem.pyc
+${PYSITELIB}/pydicom/dataelem.pyo
+${PYSITELIB}/pydicom/dataset.py
+${PYSITELIB}/pydicom/dataset.pyc
+${PYSITELIB}/pydicom/dataset.pyo
 ${PYSITELIB}/pydicom/dicomdir.py
 ${PYSITELIB}/pydicom/dicomdir.pyc
 ${PYSITELIB}/pydicom/dicomdir.pyo
@@ -222,6 +284,24 @@ ${PYSITELIB}/pydicom/dicomio.pyo
 ${PYSITELIB}/pydicom/encaps.py
 ${PYSITELIB}/pydicom/encaps.pyc
 ${PYSITELIB}/pydicom/encaps.pyo
+${PYSITELIB}/pydicom/encoders/__init__.py
+${PYSITELIB}/pydicom/encoders/__init__.pyc
+${PYSITELIB}/pydicom/encoders/__init__.pyo
+${PYSITELIB}/pydicom/encoders/base.py
+${PYSITELIB}/pydicom/encoders/base.pyc
+${PYSITELIB}/pydicom/encoders/base.pyo
+${PYSITELIB}/pydicom/encoders/gdcm.py
+${PYSITELIB}/pydicom/encoders/gdcm.pyc
+${PYSITELIB}/pydicom/encoders/gdcm.pyo
+${PYSITELIB}/pydicom/encoders/native.py
+${PYSITELIB}/pydicom/encoders/native.pyc
+${PYSITELIB}/pydicom/encoders/native.pyo
+${PYSITELIB}/pydicom/encoders/pylibjpeg.py
+${PYSITELIB}/pydicom/encoders/pylibjpeg.pyc
+${PYSITELIB}/pydicom/encoders/pylibjpeg.pyo
+${PYSITELIB}/pydicom/env_info.py
+${PYSITELIB}/pydicom/env_info.pyc
+${PYSITELIB}/pydicom/env_info.pyo
 ${PYSITELIB}/pydicom/errors.py
 ${PYSITELIB}/pydicom/errors.pyc
 ${PYSITELIB}/pydicom/errors.pyo
@@ -231,15 +311,15 @@ ${PYSITELIB}/pydicom/filebase.pyo
 ${PYSITELIB}/pydicom/filereader.py
 ${PYSITELIB}/pydicom/filereader.pyc
 ${PYSITELIB}/pydicom/filereader.pyo
+${PYSITELIB}/pydicom/fileset.py
+${PYSITELIB}/pydicom/fileset.pyc
+${PYSITELIB}/pydicom/fileset.pyo
 ${PYSITELIB}/pydicom/fileutil.py
 ${PYSITELIB}/pydicom/fileutil.pyc
 ${PYSITELIB}/pydicom/fileutil.pyo
 ${PYSITELIB}/pydicom/filewriter.py
 ${PYSITELIB}/pydicom/filewriter.pyc
 ${PYSITELIB}/pydicom/filewriter.pyo
-${PYSITELIB}/pydicom/__init__.py
-${PYSITELIB}/pydicom/__init__.pyc
-${PYSITELIB}/pydicom/__init__.pyo
 ${PYSITELIB}/pydicom/jsonrep.py
 ${PYSITELIB}/pydicom/jsonrep.pyc
 ${PYSITELIB}/pydicom/jsonrep.pyo
@@ -249,12 +329,21 @@ ${PYSITELIB}/pydicom/misc.pyo
 ${PYSITELIB}/pydicom/multival.py
 ${PYSITELIB}/pydicom/multival.pyc
 ${PYSITELIB}/pydicom/multival.pyo
-${PYSITELIB}/pydicom/pixel_data_handlers/gdcm_handler.py
-${PYSITELIB}/pydicom/pixel_data_handlers/gdcm_handler.pyc
-${PYSITELIB}/pydicom/pixel_data_handlers/gdcm_handler.pyo
+${PYSITELIB}/pydicom/overlay_data_handlers/__init__.py
+${PYSITELIB}/pydicom/overlay_data_handlers/__init__.pyc
+${PYSITELIB}/pydicom/overlay_data_handlers/__init__.pyo
+${PYSITELIB}/pydicom/overlays/__init__.py
+${PYSITELIB}/pydicom/overlays/__init__.pyc
+${PYSITELIB}/pydicom/overlays/__init__.pyo
+${PYSITELIB}/pydicom/overlays/numpy_handler.py
+${PYSITELIB}/pydicom/overlays/numpy_handler.pyc
+${PYSITELIB}/pydicom/overlays/numpy_handler.pyo
 ${PYSITELIB}/pydicom/pixel_data_handlers/__init__.py
 ${PYSITELIB}/pydicom/pixel_data_handlers/__init__.pyc
 ${PYSITELIB}/pydicom/pixel_data_handlers/__init__.pyo
+${PYSITELIB}/pydicom/pixel_data_handlers/gdcm_handler.py
+${PYSITELIB}/pydicom/pixel_data_handlers/gdcm_handler.pyc
+${PYSITELIB}/pydicom/pixel_data_handlers/gdcm_handler.pyo
 ${PYSITELIB}/pydicom/pixel_data_handlers/jpeg_ls_handler.py
 ${PYSITELIB}/pydicom/pixel_data_handlers/jpeg_ls_handler.pyc
 ${PYSITELIB}/pydicom/pixel_data_handlers/jpeg_ls_handler.pyo
@@ -264,48 +353,67 @@ ${PYSITELIB}/pydicom/pixel_data_handlers/numpy_handler.pyo
 ${PYSITELIB}/pydicom/pixel_data_handlers/pillow_handler.py
 ${PYSITELIB}/pydicom/pixel_data_handlers/pillow_handler.pyc
 ${PYSITELIB}/pydicom/pixel_data_handlers/pillow_handler.pyo
+${PYSITELIB}/pydicom/pixel_data_handlers/pylibjpeg_handler.py
+${PYSITELIB}/pydicom/pixel_data_handlers/pylibjpeg_handler.pyc
+${PYSITELIB}/pydicom/pixel_data_handlers/pylibjpeg_handler.pyo
 ${PYSITELIB}/pydicom/pixel_data_handlers/rle_handler.py
 ${PYSITELIB}/pydicom/pixel_data_handlers/rle_handler.pyc
 ${PYSITELIB}/pydicom/pixel_data_handlers/rle_handler.pyo
 ${PYSITELIB}/pydicom/pixel_data_handlers/util.py
 ${PYSITELIB}/pydicom/pixel_data_handlers/util.pyc
 ${PYSITELIB}/pydicom/pixel_data_handlers/util.pyo
-${PYSITELIB}/pydicom/_private_dict.py
-${PYSITELIB}/pydicom/_private_dict.pyc
-${PYSITELIB}/pydicom/_private_dict.pyo
+${PYSITELIB}/pydicom/py.typed
 ${PYSITELIB}/pydicom/sequence.py
 ${PYSITELIB}/pydicom/sequence.pyc
 ${PYSITELIB}/pydicom/sequence.pyo
-${PYSITELIB}/pydicom/_storage_sopclass_uids.py
-${PYSITELIB}/pydicom/_storage_sopclass_uids.pyc
-${PYSITELIB}/pydicom/_storage_sopclass_uids.pyo
+${PYSITELIB}/pydicom/sr/__init__.py
+${PYSITELIB}/pydicom/sr/__init__.pyc
+${PYSITELIB}/pydicom/sr/__init__.pyo
+${PYSITELIB}/pydicom/sr/_cid_dict.py
+${PYSITELIB}/pydicom/sr/_cid_dict.pyc
+${PYSITELIB}/pydicom/sr/_cid_dict.pyo
+${PYSITELIB}/pydicom/sr/_concepts_dict.py
+${PYSITELIB}/pydicom/sr/_concepts_dict.pyc
+${PYSITELIB}/pydicom/sr/_concepts_dict.pyo
+${PYSITELIB}/pydicom/sr/_snomed_dict.py
+${PYSITELIB}/pydicom/sr/_snomed_dict.pyc
+${PYSITELIB}/pydicom/sr/_snomed_dict.pyo
+${PYSITELIB}/pydicom/sr/codedict.py
+${PYSITELIB}/pydicom/sr/codedict.pyc
+${PYSITELIB}/pydicom/sr/codedict.pyo
+${PYSITELIB}/pydicom/sr/coding.py
+${PYSITELIB}/pydicom/sr/coding.pyc
+${PYSITELIB}/pydicom/sr/coding.pyo
 ${PYSITELIB}/pydicom/tag.py
 ${PYSITELIB}/pydicom/tag.pyc
 ${PYSITELIB}/pydicom/tag.pyo
-${PYSITELIB}/pydicom/tests/_handler_common.py
-${PYSITELIB}/pydicom/tests/_handler_common.pyc
-${PYSITELIB}/pydicom/tests/_handler_common.pyo
 ${PYSITELIB}/pydicom/tests/__init__.py
 ${PYSITELIB}/pydicom/tests/__init__.pyc
 ${PYSITELIB}/pydicom/tests/__init__.pyo
-${PYSITELIB}/pydicom/tests/performance/__init__.py
-${PYSITELIB}/pydicom/tests/performance/__init__.pyc
-${PYSITELIB}/pydicom/tests/performance/__init__.pyo
-${PYSITELIB}/pydicom/tests/performance/raw_convert_test.py
-${PYSITELIB}/pydicom/tests/performance/raw_convert_test.pyc
-${PYSITELIB}/pydicom/tests/performance/raw_convert_test.pyo
-${PYSITELIB}/pydicom/tests/performance/time_test.py
-${PYSITELIB}/pydicom/tests/performance/time_test.pyc
-${PYSITELIB}/pydicom/tests/performance/time_test.pyo
-${PYSITELIB}/pydicom/tests/performance/write_profiling.py
-${PYSITELIB}/pydicom/tests/performance/write_profiling.pyc
-${PYSITELIB}/pydicom/tests/performance/write_profiling.pyo
+${PYSITELIB}/pydicom/tests/_write_stds.py
+${PYSITELIB}/pydicom/tests/_write_stds.pyc
+${PYSITELIB}/pydicom/tests/_write_stds.pyo
+${PYSITELIB}/pydicom/tests/conftest.py
+${PYSITELIB}/pydicom/tests/conftest.pyc
+${PYSITELIB}/pydicom/tests/conftest.pyo
+${PYSITELIB}/pydicom/tests/test_JPEG_LS_transfer_syntax.py
+${PYSITELIB}/pydicom/tests/test_JPEG_LS_transfer_syntax.pyc
+${PYSITELIB}/pydicom/tests/test_JPEG_LS_transfer_syntax.pyo
 ${PYSITELIB}/pydicom/tests/test_charset.py
 ${PYSITELIB}/pydicom/tests/test_charset.pyc
 ${PYSITELIB}/pydicom/tests/test_charset.pyo
-${PYSITELIB}/pydicom/tests/test_compat.py
-${PYSITELIB}/pydicom/tests/test_compat.pyc
-${PYSITELIB}/pydicom/tests/test_compat.pyo
+${PYSITELIB}/pydicom/tests/test_cli.py
+${PYSITELIB}/pydicom/tests/test_cli.pyc
+${PYSITELIB}/pydicom/tests/test_cli.pyo
+${PYSITELIB}/pydicom/tests/test_codes.py
+${PYSITELIB}/pydicom/tests/test_codes.pyc
+${PYSITELIB}/pydicom/tests/test_codes.pyo
+${PYSITELIB}/pydicom/tests/test_config.py
+${PYSITELIB}/pydicom/tests/test_config.pyc
+${PYSITELIB}/pydicom/tests/test_config.pyo
+${PYSITELIB}/pydicom/tests/test_data_manager.py
+${PYSITELIB}/pydicom/tests/test_data_manager.pyc
+${PYSITELIB}/pydicom/tests/test_data_manager.pyo
 ${PYSITELIB}/pydicom/tests/test_dataelem.py
 ${PYSITELIB}/pydicom/tests/test_dataelem.pyc
 ${PYSITELIB}/pydicom/tests/test_dataelem.pyo
@@ -321,6 +429,18 @@ ${PYSITELIB}/pydicom/tests/test_dictionary.pyo
 ${PYSITELIB}/pydicom/tests/test_encaps.py
 ${PYSITELIB}/pydicom/tests/test_encaps.pyc
 ${PYSITELIB}/pydicom/tests/test_encaps.pyo
+${PYSITELIB}/pydicom/tests/test_encoders.py
+${PYSITELIB}/pydicom/tests/test_encoders.pyc
+${PYSITELIB}/pydicom/tests/test_encoders.pyo
+${PYSITELIB}/pydicom/tests/test_encoders_gdcm.py
+${PYSITELIB}/pydicom/tests/test_encoders_gdcm.pyc
+${PYSITELIB}/pydicom/tests/test_encoders_gdcm.pyo
+${PYSITELIB}/pydicom/tests/test_encoders_pydicom.py
+${PYSITELIB}/pydicom/tests/test_encoders_pydicom.pyc
+${PYSITELIB}/pydicom/tests/test_encoders_pydicom.pyo
+${PYSITELIB}/pydicom/tests/test_env_info.py
+${PYSITELIB}/pydicom/tests/test_env_info.pyc
+${PYSITELIB}/pydicom/tests/test_env_info.pyo
 ${PYSITELIB}/pydicom/tests/test_environment.py
 ${PYSITELIB}/pydicom/tests/test_environment.pyc
 ${PYSITELIB}/pydicom/tests/test_environment.pyo
@@ -333,12 +453,15 @@ ${PYSITELIB}/pydicom/tests/test_filebase.pyo
 ${PYSITELIB}/pydicom/tests/test_filereader.py
 ${PYSITELIB}/pydicom/tests/test_filereader.pyc
 ${PYSITELIB}/pydicom/tests/test_filereader.pyo
+${PYSITELIB}/pydicom/tests/test_fileset.py
+${PYSITELIB}/pydicom/tests/test_fileset.pyc
+${PYSITELIB}/pydicom/tests/test_fileset.pyo
+${PYSITELIB}/pydicom/tests/test_fileutil.py
+${PYSITELIB}/pydicom/tests/test_fileutil.pyc
+${PYSITELIB}/pydicom/tests/test_fileutil.pyo
 ${PYSITELIB}/pydicom/tests/test_filewriter.py
 ${PYSITELIB}/pydicom/tests/test_filewriter.pyc
 ${PYSITELIB}/pydicom/tests/test_filewriter.pyo
-${PYSITELIB}/pydicom/tests/test_fixes.py
-${PYSITELIB}/pydicom/tests/test_fixes.pyc
-${PYSITELIB}/pydicom/tests/test_fixes.pyo
 ${PYSITELIB}/pydicom/tests/test_gdcm_pixel_data.py
 ${PYSITELIB}/pydicom/tests/test_gdcm_pixel_data.pyc
 ${PYSITELIB}/pydicom/tests/test_gdcm_pixel_data.pyo
@@ -348,9 +471,6 @@ ${PYSITELIB}/pydicom/tests/test_handler_util.pyo
 ${PYSITELIB}/pydicom/tests/test_jpeg_ls_pixel_data.py
 ${PYSITELIB}/pydicom/tests/test_jpeg_ls_pixel_data.pyc
 ${PYSITELIB}/pydicom/tests/test_jpeg_ls_pixel_data.pyo
-${PYSITELIB}/pydicom/tests/test_JPEG_LS_transfer_syntax.py
-${PYSITELIB}/pydicom/tests/test_JPEG_LS_transfer_syntax.pyc
-${PYSITELIB}/pydicom/tests/test_JPEG_LS_transfer_syntax.pyo
 ${PYSITELIB}/pydicom/tests/test_json.py
 ${PYSITELIB}/pydicom/tests/test_json.pyc
 ${PYSITELIB}/pydicom/tests/test_json.pyo
@@ -363,9 +483,15 @@ ${PYSITELIB}/pydicom/tests/test_multival.pyo
 ${PYSITELIB}/pydicom/tests/test_numpy_pixel_data.py
 ${PYSITELIB}/pydicom/tests/test_numpy_pixel_data.pyc
 ${PYSITELIB}/pydicom/tests/test_numpy_pixel_data.pyo
+${PYSITELIB}/pydicom/tests/test_overlay_np.py
+${PYSITELIB}/pydicom/tests/test_overlay_np.pyc
+${PYSITELIB}/pydicom/tests/test_overlay_np.pyo
 ${PYSITELIB}/pydicom/tests/test_pillow_pixel_data.py
 ${PYSITELIB}/pydicom/tests/test_pillow_pixel_data.pyc
 ${PYSITELIB}/pydicom/tests/test_pillow_pixel_data.pyo
+${PYSITELIB}/pydicom/tests/test_pylibjpeg.py
+${PYSITELIB}/pydicom/tests/test_pylibjpeg.pyc
+${PYSITELIB}/pydicom/tests/test_pylibjpeg.pyo
 ${PYSITELIB}/pydicom/tests/test_rawread.py
 ${PYSITELIB}/pydicom/tests/test_rawread.pyc
 ${PYSITELIB}/pydicom/tests/test_rawread.pyo
@@ -393,15 +519,15 @@ ${PYSITELIB}/pydicom/tests/test_valuerep.pyo
 ${PYSITELIB}/pydicom/tests/test_values.py
 ${PYSITELIB}/pydicom/tests/test_values.pyc
 ${PYSITELIB}/pydicom/tests/test_values.pyo
-${PYSITELIB}/pydicom/tests/_write_stds.py
-${PYSITELIB}/pydicom/tests/_write_stds.pyc
-${PYSITELIB}/pydicom/tests/_write_stds.pyo
-${PYSITELIB}/pydicom/_uid_dict.py
-${PYSITELIB}/pydicom/_uid_dict.pyc
-${PYSITELIB}/pydicom/_uid_dict.pyo
+${PYSITELIB}/pydicom/tests/test_waveform.py
+${PYSITELIB}/pydicom/tests/test_waveform.pyc
+${PYSITELIB}/pydicom/tests/test_waveform.pyo
 ${PYSITELIB}/pydicom/uid.py
 ${PYSITELIB}/pydicom/uid.pyc
 ${PYSITELIB}/pydicom/uid.pyo
+${PYSITELIB}/pydicom/util/__init__.py
+${PYSITELIB}/pydicom/util/__init__.pyc
+${PYSITELIB}/pydicom/util/__init__.pyo
 ${PYSITELIB}/pydicom/util/codify.py
 ${PYSITELIB}/pydicom/util/codify.pyc
 ${PYSITELIB}/pydicom/util/codify.pyo
@@ -411,15 +537,9 @@ ${PYSITELIB}/pydicom/util/dump.pyo
 ${PYSITELIB}/pydicom/util/fixer.py
 ${PYSITELIB}/pydicom/util/fixer.pyc
 ${PYSITELIB}/pydicom/util/fixer.pyo
-${PYSITELIB}/pydicom/util/fixes.py
-${PYSITELIB}/pydicom/util/fixes.pyc
-${PYSITELIB}/pydicom/util/fixes.pyo
 ${PYSITELIB}/pydicom/util/hexutil.py
 ${PYSITELIB}/pydicom/util/hexutil.pyc
 ${PYSITELIB}/pydicom/util/hexutil.pyo
-${PYSITELIB}/pydicom/util/__init__.py
-${PYSITELIB}/pydicom/util/__init__.pyc
-${PYSITELIB}/pydicom/util/__init__.pyo
 ${PYSITELIB}/pydicom/util/leanread.py
 ${PYSITELIB}/pydicom/util/leanread.pyc
 ${PYSITELIB}/pydicom/util/leanread.pyo
@@ -429,8 +549,9 @@ ${PYSITELIB}/pydicom/valuerep.pyo
 ${PYSITELIB}/pydicom/values.py
 ${PYSITELIB}/pydicom/values.pyc
 ${PYSITELIB}/pydicom/values.pyo
-${PYSITELIB}/pydicom/_version.py
-${PYSITELIB}/pydicom/_version.pyc
-${PYSITELIB}/pydicom/_version.pyo
-${DOCDIR}/LICENSE
-${DOCDIR}/README.md
+${PYSITELIB}/pydicom/waveforms/__init__.py
+${PYSITELIB}/pydicom/waveforms/__init__.pyc
+${PYSITELIB}/pydicom/waveforms/__init__.pyo
+${PYSITELIB}/pydicom/waveforms/numpy_handler.py
+${PYSITELIB}/pydicom/waveforms/numpy_handler.pyc
+${PYSITELIB}/pydicom/waveforms/numpy_handler.pyo
diff --git a/biology/py-pydicom/distinfo b/biology/py-pydicom/distinfo
index f96c1e7f825..fb87873f693 100644
--- a/biology/py-pydicom/distinfo
+++ b/biology/py-pydicom/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2019/10/01 14:45:29 nia Exp $
+$NetBSD: distinfo,v 1.4 2021/08/29 12:59:39 adam Exp $
 
-SHA1 (pydicom-1.3.0.tar.gz) = 8fdc0d10559cb59ecc23e7d3e6edc94d95d6fb3b
-RMD160 (pydicom-1.3.0.tar.gz) = 86a76c5ab554609ae0831bbfcf078df38a5fbca3
-SHA512 (pydicom-1.3.0.tar.gz) = bff4925ed77aae812a507c1501db0772964f1d76637f7eaf1b978bbcf080e2fff6f15f4a35c14b4828913114817c76a6d79df8e94c3c2f6a173949d8a084dc63
-Size (pydicom-1.3.0.tar.gz) = 7070424 bytes
+SHA1 (pydicom-2.2.1.tar.gz) = 7e5796c0eb7eeb2af65e1b3822ea2c6f77bcdc7a
+RMD160 (pydicom-2.2.1.tar.gz) = 90ac1f5b866bb12fa73c77dd82f2280a88331d63
+SHA512 (pydicom-2.2.1.tar.gz) = 4a4716a59428dff1774e09be405c4d39aae8f2c7a7fde9efbe11209334e94648122ac40cc59dc1176eb6af96783674cca13f082ec38046ba66f972616e06ffe4
+Size (pydicom-2.2.1.tar.gz) = 2149457 bytes