[med-svn] [Git][med-team/pydicom][master] 7 commits: Drop dversionmangle from watch file

Andreas Tille (@tille) gitlab at salsa.debian.org
Mon Nov 28 17:14:27 GMT 2022 


Andreas Tille pushed to branch master at Debian Med / pydicom


Commits:
f19c1c85 by Andreas Tille at 2022-11-28T17:57:56+01:00
Drop dversionmangle from watch file

- - - - -
8f3763d5 by Andreas Tille at 2022-11-28T17:58:14+01:00
New upstream version 2.3.1
- - - - -
618f95bb by Andreas Tille at 2022-11-28T17:58:14+01:00
routine-update: New upstream version

- - - - -
553d5a3c by Andreas Tille at 2022-11-28T17:58:22+01:00
Update upstream source from tag 'upstream/2.3.1'

Update to upstream version '2.3.1'
with Debian dir a0f8d35236d5e403dc7ae86d8984696c9a564ad4
- - - - -
6c5c371e by Andreas Tille at 2022-11-28T17:58:35+01:00
Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse.

Changes-By: lintian-brush

- - - - -
5f8af488 by Andreas Tille at 2022-11-28T17:58:38+01:00
Apply multi-arch hints.
+ python-pydicom-doc: Add Multi-Arch: foreign.

Changes-By: apply-multiarch-hints

- - - - -
f0421975 by Andreas Tille at 2022-11-28T18:09:22+01:00
Team upload to unstable

- - - - -


16 changed files:

- .github/workflows/merge-pytest.yml
- .github/workflows/merge-typing.yml
- .github/workflows/pr-pytest.yml
- .github/workflows/pr-type-lint-spell.yml
- README.md
- debian/changelog
- debian/control
- debian/upstream/metadata
- debian/watch
- doc/release_notes/v2.3.0.rst
- pydicom/_version.py
- pydicom/multival.py
- pydicom/pixel_data_handlers/numpy_handler.py
- pydicom/tests/test_fileset.py
- pydicom/valuerep.py
- setup.py


Changes:

=====================================
.github/workflows/merge-pytest.yml
=====================================
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - 2.3.X
 
 jobs:
   test-all:
@@ -12,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
         include:
           - os: ubuntu-latest
             python-version: '3.10'


=====================================
.github/workflows/merge-typing.yml
=====================================
@@ -2,7 +2,9 @@ name: type-hints
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - 2.3.X
 
 jobs:
 
@@ -12,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10' ]
+        python-version: [ '3.6', '3.7', '3.8', '3.9', '3.10', '3.11' ]
 
     steps:
     - uses: actions/checkout at v2
@@ -25,7 +27,7 @@ jobs:
     - name: Install typing dependencies
       run: |
         python -m pip install -U pip
-        python -m pip install -U mypy
+        python -m pip install mypy==0.971
         python -m pip install -U types-requests types-pkg_resources types-setuptools
     - name: Run typing check with mypy
       run: |


=====================================
.github/workflows/pr-pytest.yml
=====================================
@@ -2,7 +2,9 @@ name: pr-unit-tests
 
 on:
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - 2.3.X
 
 jobs:
   test-pypy:
@@ -36,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.11']
         include:
           - os: 'ubuntu-latest'
             pytest-args: --cov=pydicom --cov-append


=====================================
.github/workflows/pr-type-lint-spell.yml
=====================================
@@ -2,7 +2,9 @@ name: pr-type-lint-spell
 
 on:
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - 2.3.X
 
 jobs:
 
@@ -25,7 +27,7 @@ jobs:
     - name: Install typing dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install -U mypy
+        python -m pip install mypy==0.971
         python -m pip install -U types-requests types-pkg_resources types-setuptools
 
     - name: Run typing check with mypy


=====================================
README.md
=====================================
@@ -4,7 +4,7 @@
 [![test-coverage](https://codecov.io/gh/pydicom/pydicom/branch/master/graph/badge.svg)](https://codecov.io/gh/pydicom/pydicom)
 [![Python version](https://img.shields.io/pypi/pyversions/pydicom.svg)](https://img.shields.io/pypi/pyversions/pydicom.svg)
 [![PyPI version](https://badge.fury.io/py/pydicom.svg)](https://badge.fury.io/py/pydicom)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5164413.svg)](https://doi.org/10.5281/zenodo.5164413)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.6394735.svg)](https://doi.org/10.5281/zenodo.6394735)
 [![Gitter](https://badges.gitter.im/pydicom/Lobby.svg)](https://gitter.im/pydicom/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # *pydicom*


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+pydicom (2.3.1-1) unstable; urgency=medium
+
+  * Team upload
+  * Drop dversionmangle from watch file
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse.
+
+ -- Andreas Tille <tille at debian.org>  Mon, 28 Nov 2022 17:58:43 +0100
+
 pydicom (2.3.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -53,6 +53,7 @@ Section: doc
 Depends: ${sphinxdoc:Depends},
          ${misc:Depends}
 Provides: python-dicom-doc
+Multi-Arch: foreign
 Description: DICOM medical file reading and writing (documentation)
  pydicom is a pure Python module for parsing DICOM files.  DICOM is a
  standard (http://medical.nema.org) for communicating medical images


=====================================
debian/upstream/metadata
=====================================
@@ -1,5 +1,5 @@
 ---
-Bug-Database: https://github.com/darcymason/pydicom/issues
-Bug-Submit: https://github.com/darcymason/pydicom/issues/new
+Bug-Database: https://github.com/pydicom/pydicom/issues
+Bug-Submit: https://github.com/pydicom/pydicom/issues/new
 Repository: https://github.com/darcymason/pydicom.git
-Repository-Browse: https://github.com/darcymason/pydicom
+Repository-Browse: https://github.com/pydicom/pydicom


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
 version=4
-opts="dversionmangle=s/\+ds\d*//,filenamemangle=s/.*\/(.*)/pydicom-$1\.tar\.gz/" \
+opts="filenamemangle=s/.*\/(.*)/pydicom-$1\.tar\.gz/" \
   https://github.com/darcymason/pydicom/tags (?:.*?/)?v?(\d[\d\.a-z]+).tar.gz


=====================================
doc/release_notes/v2.3.0.rst
=====================================
@@ -1,3 +1,11 @@
+Version 2.3.1
+=================================
+
+Changes
+-------
+* updated for Python 3.11 compatibility
+
+
 Version 2.3.0
 =================================
 


=====================================
pydicom/_version.py
=====================================
@@ -3,7 +3,7 @@ import re
 from typing import cast, Match
 
 
-__version__: str = '2.3.0'
+__version__: str = '2.3.1'
 
 result = cast(Match[str], re.match(r'(\d+\.\d+\.\d+).*', __version__))
 __version_info__ = tuple(result.group(1).split('.'))


=====================================
pydicom/multival.py
=====================================
@@ -81,7 +81,9 @@ class MultiValue(MutableSequence[_ItemType]):
         """
         self._list.extend([self.type_constructor(x) for x in val])
 
-    def __iadd__(self, other: Iterable[_T]) -> MutableSequence[_ItemType]:
+    def __iadd__(  # type: ignore[override]
+            self, other: Iterable[_T]
+    ) -> MutableSequence[_ItemType]:
         """Implement MultiValue() += Iterable[Any]."""
         self._list += [self.type_constructor(x) for x in other]
         return self


=====================================
pydicom/pixel_data_handlers/numpy_handler.py
=====================================
@@ -184,7 +184,7 @@ def get_pixeldata(ds: "Dataset", read_only: bool = False) -> "np.ndarray":
         'SamplesPerPixel', 'PhotometricInterpretation'
     ]
     if px_keyword[0] == 'PixelData':
-        # Attributess required by Image Pixel Description Macro Attributes
+        # Attributes required by Image Pixel Description Macro Attributes
         required_elements.extend(['PixelRepresentation', 'BitsStored'])
     missing = [elem for elem in required_elements if elem not in ds]
     if missing:


=====================================
pydicom/tests/test_fileset.py
=====================================
@@ -1,5 +1,6 @@
 
 import os
+import sys
 from pathlib import Path
 import shutil
 from tempfile import TemporaryDirectory
@@ -1225,7 +1226,9 @@ class TestFileSet:
         """Test setting the File-set's path."""
         fs = FileSet()
         assert fs.path is None
-        with pytest.raises(AttributeError, match=r"can't set attribute"):
+        msg = (r"can't set attribute" if sys.version_info < (3, 11)
+               else r"property 'path' of 'FileSet' object has no setter")
+        with pytest.raises(AttributeError, match=msg):
             fs.path = tdir.name
 
         # Test with str


=====================================
pydicom/valuerep.py
=====================================
@@ -621,9 +621,9 @@ class TM(_DateTimeBase, datetime.time):
     """
     _RE_TIME = re.compile(
         r"(?P<h>^([01][0-9]|2[0-3]))"
-        r"((?P<m>([0-5][0-9]))?"
-        r"(?(5)(?P<s>([0-5][0-9]|60))?)"
-        r"(?(7)(\.(?P<ms>([0-9]{1,6})?))?))$"
+        r"((?P<m>([0-5][0-9]))"
+        r"((?P<s>([0-5][0-9]|60))"
+        r"(\.(?P<ms>([0-9]{1,6})?))?)?)?$"
     )
 
     def __new__(  # type: ignore[misc]


=====================================
setup.py
=====================================
@@ -51,6 +51,7 @@ setup(
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Operating System :: OS Independent",
         "Topic :: Scientific/Engineering :: Medical Science Apps.",
         "Topic :: Scientific/Engineering :: Physics",



View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/compare/c4deae1bc72e7b09cb87760275b1ede7581beea6...f0421975ab576cfa8336babde2b9fc65779d56a1

-- 
View it on GitLab: https://salsa.debian.org/med-team/pydicom/-/compare/c4deae1bc72e7b09cb87760275b1ede7581beea6...f0421975ab576cfa8336babde2b9fc65779d56a1
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20221128/c00e7fa5/attachment-0001.htm>

More information about the debian-med-commit mailing list