Extend pre-commit configuration with new hooks

.github/workflows/Windows-IntelLLVM_3.22.cmake

@@ -1,24 +1,28 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
-
 # This module is shared by multiple languages; use include blocker.
 if(__WINDOWS_INTEL)
-  return()
+    return()
 endif()
 set(__WINDOWS_INTEL 1)
 
 include(Platform/Windows-MSVC)
 macro(__windows_compiler_intel lang)
-  __windows_compiler_msvc(${lang})
-
-  set(CMAKE_${lang}_LINK_EXECUTABLE    "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -link -out:<TARGET> -implib:<TARGET_IMPLIB> -pdb:<TARGET_PDB> -version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}")
-  set(CMAKE_${lang}_CREATE_SHARED_LIBRARY    "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -LD -link -out:<TARGET> -implib:<TARGET_IMPLIB> -pdb:<TARGET_PDB> -version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
-  set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
-  if (NOT "${lang}" STREQUAL "Fortran")    # Fortran driver does not support -fuse-ld, yet
-    set(CMAKE_${lang}_CREATE_STATIC_LIBRARY      "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -fuse-ld=llvm-lib -o <TARGET> -link <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
-  endif()
-  set(CMAKE_DEPFILE_FLAGS_${lang} "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
-  set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
+    __windows_compiler_msvc(${lang})
 
+    set(CMAKE_${lang}_LINK_EXECUTABLE
+        "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -link -out:<TARGET> -implib:<TARGET_IMPLIB> -pdb:<TARGET_PDB> -version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES>${CMAKE_END_TEMP_FILE}"
+    )
+    set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
+        "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -LD -link -out:<TARGET> -implib:<TARGET_IMPLIB> -pdb:<TARGET_PDB> -version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}"
+    )
+    set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
+    if(NOT "${lang}" STREQUAL "Fortran") # Fortran driver does not support -fuse-ld, yet
+        set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
+            "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -fuse-ld=llvm-lib -o <TARGET> -link <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}"
+        )
+    endif()
+    set(CMAKE_DEPFILE_FLAGS_${lang} "-QMMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
+    set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
 endmacro()

.github/workflows/Windows-IntelLLVM_3.26.cmake

@@ -1,10 +1,9 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
-
 # This module is shared by multiple languages; use include blocker.
 if(__WINDOWS_INTEL_LLVM)
-  return()
+    return()
 endif()
 set(__WINDOWS_INTEL_LLVM 1)
 
@@ -15,52 +14,65 @@ set(__WINDOWS_INTEL_LLVM 1)
 
 # Save original CMAKE_${t}_LINKER_FLAGS_INIT
 foreach(t EXE SHARED MODULE STATIC)
-  set(_saved_cmake_${t}_linker_flags_init ${CMAKE_${t}_LINKER_FLAGS_INIT})
-  set(CMAKE_${t}_LINKER_FLAGS_INIT "")
+    set(_saved_cmake_${t}_linker_flags_init ${CMAKE_${t}_LINKER_FLAGS_INIT})
+    set(CMAKE_${t}_LINKER_FLAGS_INIT "")
 endforeach()
 include(Platform/Windows-MSVC)
 # Wrap linker flags from Windows-MSVC
 set(_IntelLLVM_LINKER_WRAPPER_FLAG "/Qoption,link,")
 set(_IntelLLVM_LINKER_WRAPPER_FLAG_SEP ",")
 foreach(t EXE SHARED MODULE STATIC)
-  set(_wrapped_linker_flags "")
-  foreach(flag ${CMAKE_${t}_LINKER_FLAGS_INIT})
-    string(STRIP ${flag} flag)
-    list(APPEND _wrapped_linker_flags "${_IntelLLVM_LINKER_WRAPPER_FLAG}${flag}")
-  endforeach()
-  set(CMAKE_${t}_LINKER_FLAGS_INIT "")
-  list(APPEND CMAKE_${t}_LINKER_FLAGS_INIT
-    ${_saved_cmake_${t}_linker_flags_init} ${_wrapped_linker_flags})
+    set(_wrapped_linker_flags "")
+    foreach(flag ${CMAKE_${t}_LINKER_FLAGS_INIT})
+        string(STRIP ${flag} flag)
+        list(APPEND _wrapped_linker_flags "${_IntelLLVM_LINKER_WRAPPER_FLAG}${flag}")
+    endforeach()
+    set(CMAKE_${t}_LINKER_FLAGS_INIT "")
+    list(
+        APPEND CMAKE_${t}_LINKER_FLAGS_INIT
+        ${_saved_cmake_${t}_linker_flags_init}
+        ${_wrapped_linker_flags}
+    )
 endforeach()
 
 macro(__windows_compiler_intel lang)
-  __windows_compiler_msvc(${lang})
+    __windows_compiler_msvc(${lang})
 
-  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "${_IntelLLVM_LINKER_WRAPPER_FLAG}")
-  set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP "${_IntelLLVM_LINKER_WRAPPER_FLAG_SEP}")
-  set(CMAKE_${lang}_CREATE_WIN32_EXE "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:windows")
-  set(CMAKE_${lang}_CREATE_CONSOLE_EXE "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:console")
-  set(CMAKE_LINK_DEF_FILE_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/DEF:")
-  set(CMAKE_LIBRARY_PATH_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/LIBPATH:")
+    set(CMAKE_${lang}_LINKER_WRAPPER_FLAG "${_IntelLLVM_LINKER_WRAPPER_FLAG}")
+    set(CMAKE_${lang}_LINKER_WRAPPER_FLAG_SEP "${_IntelLLVM_LINKER_WRAPPER_FLAG_SEP}")
+    set(CMAKE_${lang}_CREATE_WIN32_EXE
+        "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:windows"
+    )
+    set(CMAKE_${lang}_CREATE_CONSOLE_EXE
+        "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/subsystem:console"
+    )
+    set(CMAKE_LINK_DEF_FILE_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/DEF:")
+    set(CMAKE_LIBRARY_PATH_FLAG "${CMAKE_${lang}_LINKER_WRAPPER_FLAG}/LIBPATH:")
 
-  # Features for LINK_LIBRARY generator expression
-  if(MSVC_VERSION GREATER "1900")
-    ## WHOLE_ARCHIVE: Force loading all members of an archive
-    set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:/WHOLEARCHIVE:<LIBRARY>")
-    set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
-  endif()
+    # Features for LINK_LIBRARY generator expression
+    if(MSVC_VERSION GREATER "1900")
+        ## WHOLE_ARCHIVE: Force loading all members of an archive
+        set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE "LINKER:/WHOLEARCHIVE:<LIBRARY>")
+        set(CMAKE_LINK_LIBRARY_USING_WHOLE_ARCHIVE_SUPPORTED TRUE)
+    endif()
 
-  set(CMAKE_${lang}_LINK_EXECUTABLE
-    "${_CMAKE_VS_LINK_EXE}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <LINK_LIBRARIES> /link /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} ${CMAKE_END_TEMP_FILE}")
-  set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
-    "${_CMAKE_VS_LINK_DLL}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -LD <LINK_FLAGS> <LINK_LIBRARIES> -link /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} ${CMAKE_END_TEMP_FILE}")
-  set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
-  if (NOT "${lang}" STREQUAL "Fortran" OR CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 2022.1)
-    # The Fortran driver does not support -fuse-ld=llvm-lib before compiler version 2022.1
-    set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
-      "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -fuse-ld=llvm-lib -o <TARGET> <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}")
-  endif()
+    set(CMAKE_${lang}_LINK_EXECUTABLE
+        "${_CMAKE_VS_LINK_EXE}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} <LINK_FLAGS> <LINK_LIBRARIES> /link /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} ${CMAKE_END_TEMP_FILE}"
+    )
+    set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
+        "${_CMAKE_VS_LINK_DLL}<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -LD <LINK_FLAGS> <LINK_LIBRARIES> -link /out:<TARGET> /implib:<TARGET_IMPLIB> /pdb:<TARGET_PDB> /version:<TARGET_VERSION_MAJOR>.<TARGET_VERSION_MINOR>${_PLATFORM_LINK_FLAGS} ${CMAKE_END_TEMP_FILE}"
+    )
+    set(CMAKE_${lang}_CREATE_SHARED_MODULE ${CMAKE_${lang}_CREATE_SHARED_LIBRARY})
+    if(
+        NOT "${lang}" STREQUAL "Fortran"
+        OR CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 2022.1
+    )
+        # The Fortran driver does not support -fuse-ld=llvm-lib before compiler version 2022.1
+        set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
+            "<CMAKE_${lang}_COMPILER> ${CMAKE_CL_NOLOGO} <CMAKE_${lang}_LINK_FLAGS> <OBJECTS> ${CMAKE_START_TEMP_FILE} -fuse-ld=llvm-lib -o <TARGET> <LINK_FLAGS> <LINK_LIBRARIES> ${CMAKE_END_TEMP_FILE}"
+        )
+    endif()
 
-  set(CMAKE_DEPFILE_FLAGS_${lang} "-QMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
-  set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
+    set(CMAKE_DEPFILE_FLAGS_${lang} "-QMD -QMT <DEP_TARGET> -QMF <DEP_FILE>")
+    set(CMAKE_${lang}_DEPFILE_FORMAT gcc)
 endmacro()

.github/workflows/build-sphinx.yml

@@ -66,7 +66,7 @@ jobs:
         if: env.oneapi-pkgs-env == ''
         run: |
           wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-          cat GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+          < GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
           rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
           echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
           sudo apt update
@@ -177,10 +177,11 @@ jobs:
 
       - name: Set a project number to current release
         run: |
-          export PROJECT_NUMBER=$(git describe --tags --abbrev=0)
+          PROJECT_NUMBER=$(git describe --tags --abbrev=0)
+          export PROJECT_NUMBER
 
-          echo PROJECT_NUMBER=${PROJECT_NUMBER}
-          echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> $GITHUB_ENV
+          echo "PROJECT_NUMBER=${PROJECT_NUMBER}"
+          echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> "$GITHUB_ENV"
 
       - name: Build backend docs
         uses: mattnotmitt/doxygen-action@b84fe17600245bb5db3d6c247cc274ea98c15a3b # v1.12
@@ -259,8 +260,8 @@ jobs:
           git remote add tokened_docs https://IntelPython:${{ secrets.GITHUB_TOKEN }}@github.com/IntelPython/dpnp.git
           git fetch tokened_docs
           git checkout --track tokened_docs/gh-pages
-          echo `pwd`
-          [ -d pull/${PR_NUM} ] && git rm -rf pull/${PR_NUM}
+          pwd
+          [ -d pull/"${PR_NUM}" ] && git rm -rf pull/"${PR_NUM}"
           git config --global user.name ${{ env.GH_BOT_NAME }}
           git config --global user.email ${{ env.GH_BOT_EMAIL }}
           git commit -m "Removing docs for closed pull request ${PR_NUM}"

.github/workflows/conda-package.yml

@@ -85,8 +85,8 @@ jobs:
       - name: Store conda paths as envs
         shell: bash -el {0}
         run: |
-          echo "CONDA_BLD=$CONDA_PREFIX/conda-bld/${{ runner.os == 'Linux' && 'linux' || 'win' }}-64/" | tr "\\\\" '/' >> $GITHUB_ENV
-          echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE${{ runner.os == 'Linux' && '/' || '\\' }}" >> $GITHUB_ENV
+          echo "CONDA_BLD=$CONDA_PREFIX/conda-bld/${{ runner.os == 'Linux' && 'linux' || 'win' }}-64/" | tr "\\\\" '/' >> "$GITHUB_ENV"
+          echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE${{ runner.os == 'Linux' && '/' || '\\' }}" >> "$GITHUB_ENV"
 
       - name: Build conda package
         id: build_conda_pkg
@@ -188,10 +188,11 @@ jobs:
 
       - name: Get package version
         run: |
-          export PACKAGE_VERSION=$(python -c "${{ env.ver-script-part1 }} ${{ env.ver-script-part2 }}")
+          PACKAGE_VERSION=$(python -c "${{ env.ver-script-part1 }} ${{ env.ver-script-part2 }}")
+          export PACKAGE_VERSION
 
-          echo PACKAGE_VERSION=${PACKAGE_VERSION}
-          echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
+          echo "PACKAGE_VERSION=${PACKAGE_VERSION}"
+          echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> "$GITHUB_ENV"
 
       - name: Install dpnp
         id: install_dpnp
@@ -468,7 +469,7 @@ jobs:
       - name: Package version
         shell: bash -el {0}
         run: |
-          echo "PACKAGE_VERSION=$(basename ${{ env.package-name }}-*.conda | sed 's/^${{ env.package-name }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
+          echo "PACKAGE_VERSION=$(basename ${{ env.package-name }}-*.conda | sed 's/^${{ env.package-name }}-\([^-]*\).*/\1/')" >> "$GITHUB_ENV"
 
       - name: Upload
         run: |
@@ -561,10 +562,11 @@ jobs:
 
       - name: Get package version
         run: |
-          export PACKAGE_VERSION=$(python -c "${{ env.ver-script-part1 }} ${{ env.ver-script-part2 }}")
+          PACKAGE_VERSION=$(python -c "${{ env.ver-script-part1 }} ${{ env.ver-script-part2 }}")
+          export PACKAGE_VERSION
 
-          echo PACKAGE_VERSION=${PACKAGE_VERSION}
-          echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> $GITHUB_ENV
+          echo "PACKAGE_VERSION=${PACKAGE_VERSION}"
+          echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> "$GITHUB_ENV"
 
       - name: Install dpnp
         id: install_dpnp
@@ -634,9 +636,11 @@ jobs:
             Passed: $PASSED_TESTS
             Failed: $FAILED_TESTS
             Skipped: $SKIPPED_TESTS"
-            echo "MESSAGE<<EOF" >> $GITHUB_ENV
-            echo "$MESSAGE" >> $GITHUB_ENV
-            echo "EOF" >> $GITHUB_ENV
+            {
+              echo "MESSAGE<<EOF"
+              echo "$MESSAGE"
+              echo "EOF"
+            } >> "$GITHUB_ENV"
           else
             echo "Array API standard conformance tests failed to run for dpnp=$PACKAGE_VERSION."
             exit 1

.github/workflows/generate_coverage.yaml

@@ -41,7 +41,7 @@ jobs:
         if: env.oneapi-pkgs-env == ''
         run: |
           wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
-          cat GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+          < GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
           rm GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB
           echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
           sudo apt update

.pre-commit-config.yaml

@@ -52,6 +52,10 @@ repos:
     -   id: rst-directive-colons
     -   id: rst-inline-touching-normal
     -   id: text-unicode-replacement-char
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.21.1
+    hooks:
+    -   id: pyupgrade
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.4.1
     hooks:
@@ -119,3 +123,13 @@ repos:
     hooks:
     -   id: pretty-format-toml
         args: [--autofix]
+-   repo: https://github.com/rhysd/actionlint
+    rev: v1.7.8
+    hooks:
+    -   id: actionlint
+-   repo: https://github.com/BlankSpruce/gersemi
+    rev: 0.23.1
+    hooks:
+    -   id: gersemi
+        exclude: "dpnp/backend/cmake/Modules/"
+        args: ["-i", "-l", "88", "--no-warn-about-unknown-commands"]

CHANGELOG.md

@@ -21,6 +21,7 @@ Also, that release drops support for Python 3.9, making Python 3.10 the minimum
 * Added implementation of `dpnp.ndarray.tolist` method [#2652](https://github.com/IntelPython/dpnp/pull/2652)
 * Added implementation of `dpnp.frexp` [#2635](https://github.com/IntelPython/dpnp/pull/2635)
 * Added implementation of `dpnp.ndarray.tofile` method [#2635](https://github.com/IntelPython/dpnp/pull/2635)
+* Extended `pre-commit` configuration with `pyupgrade`, `actionlint`, and `gersemi` hooks  [#2658](https://github.com/IntelPython/dpnp/pull/2658)
 
 ### Changed