Bump up the Black version to 25.x (NVIDIA#5849)

- moves to black version 25.1
- reformats files according to black==25.1

Signed-off-by: Janusz Lisiecki <[email protected]>

Author: JanuszL

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.10'
-      - run: pip install  flake8 bandit "black[jupyter]"==24.8.0
+      - run: pip install  flake8 bandit "black[jupyter]"==25.1.0
       # keep black invocations separated so each invocation will pick appropriate configuration file
       # from the top dir used for it
       - run: black --check --verbose ${{ env.PYTHON_SECURITY_LINT_PATHS }} ${{ env.PYTHON_LINT_PATHS }} ${{ env.AUTOGRAPH_LINT_PATHS }}

conda/dali_python_bindings/recipe/meta.yaml

@@ -69,8 +69,8 @@ requirements:
     - patchelf
     - python-clang
     - git-lfs
-    - black =24.8.0
-    - black-jupyter =24.8.0
+    - black =25.1.0
+    - black-jupyter =25.1.0
     - bandit
   host:
     - libprotobuf-static =5.27.4

dali/python/nvidia/dali/auto_aug/core/policy.py

@@ -126,7 +126,7 @@ def __repr__(self):
 
 
 def _sub_policy_with_unique_names(
-    sub_policies: Sequence[Sequence[Tuple[Augmentation, float, Optional[int]]]]
+    sub_policies: Sequence[Sequence[Tuple[Augmentation, float, Optional[int]]]],
 ) -> Sequence[Sequence[Tuple[Augmentation, float, Optional[int]]]]:
     """
     Check if the augmentations used in the sub-policies have unique names.

dali/python/nvidia/dali/pipeline.py

@@ -2012,7 +2012,7 @@ def _generate_graph(pipe, func, fn_args, fn_kwargs):
 # Bare decorator usage
 @overload
 def pipeline_def(
-    __func: Callable[..., Union[DataNode, Tuple[DataNode, ...]]]
+    __func: Callable[..., Union[DataNode, Tuple[DataNode, ...]]],
 ) -> Callable[..., Pipeline]: ...
 
 

dali/test/python/decoder/test_jpeg_scan_limit.py

@@ -96,14 +96,14 @@ def generate_file(cls, decoding_method, decoding_step):
         # fmt: on
         file = tempfile.NamedTemporaryFile(mode="w+b", delete=True)
         try:
-            file.write(b"\xFF\xD8")
-            file.write(b"\xFF")
-            file.write(b"\xC2" if decoding_method == "huffman" else b"\xCA")
-            file.write(b"\x00\x0B\x08")
+            file.write(b"\xff\xd8")
+            file.write(b"\xff")
+            file.write(b"\xc2" if decoding_method == "huffman" else b"\xca")
+            file.write(b"\x00\x0b\x08")
             file.write(extent)
             file.write(extent)
             file.write(b"\x01\x00\x11\x00")
-            file.write(b"\xFF\xDB\x00\x43\x00")
+            file.write(b"\xff\xdb\x00\x43\x00")
             file.write(quant_table)
             if decoding_method == "huffman":
                 file.write(b"\xff\xc4")  # DHT marker

dali/test/python/operator_2/test_squeeze.py

@@ -71,7 +71,7 @@ def test_squeeze():
         ),
         (None, "Z", "XYZ", [(300, 1, 1), (10, 1, 1)], [(300, 1), (10, 1)], "XY"),
         (None, "ZY", "XYZ", [(300, 1, 1), (10, 1, 1)], [(300,), (10,)], "X"),
-        ([0], None, "X", [(1)], [()], ""),
+        ([0], None, "X", [(1,)], [()], ""),
         ([1], None, "XYZ", [(100, 0, 0)], [(100, 0)], "XZ"),
         (None, "Z", "XYZ", [(100, 0, 0)], [(100, 0)], "XY"),
         (None, "X", "XYZ", [(100, 0, 0)], [(0, 0)], "YZ"),

dali/test/python/test_dali_tf_plugin_cpu_only.py

@@ -41,7 +41,7 @@ def get_data(batch_size, value):
     with tf.device("/cpu"):
         data = daliop(
             pipeline=pipe,
-            shapes=[(batch_size)],
+            shapes=[batch_size],
             dtypes=[tf.int32],
             device_id=types.CPU_ONLY_DEVICE_ID,
         )

dali/test/python/test_external_source_parallel_shared_batch.py

@@ -45,7 +45,7 @@ def check_serialize_deserialize(batch):
 
 def test_serialize_deserialize():
     for shapes in [
-        [(10)],
+        [(10,)],
         [(10, 20)],
         [(10, 20, 3)],
         [(1), (2)],

docker/Dockerfile

@@ -13,14 +13,14 @@ ENV PYVER=${PYVER} \
     PYTHONPATH=/opt/python/v \
     PYBIN=${PYTHONPATH}/bin \
     PYLIB=${PYTHONPATH}/lib \
-    PATH=/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:${PYBIN}:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin:${PYBIN}:/opt/python/cp312-cp312/bin:/opt/python/cp313-cp313/bin:${PYBIN}:${PATH} \
-    LD_LIBRARY_PATH=/usr/local/lib:/opt/dali/${DALI_BUILD_DIR}:/opt/python/cp38-cp38/lib:/opt/python/cp39-cp39/lib:/opt/python/cp310-cp310/lib:/opt/python/cp311-cp311/lib:${PYLIB}:/opt/python/cp312-cp312/lib:/opt/python/cp313-cp313/lib:${PYLIB}:${LD_LIBRARY_PATH} \
-    LIBRARY_PATH=/usr/local/lib:/opt/dali/${DALI_BUILD_DIR}:/opt/python/cp38-cp38/lib:/opt/python/cp39-cp39/lib:/opt/python/cp310-cp310/lib:/opt/python/cp311-cp311/lib:${PYLIB}:/opt/python/cp312-cp312/lib:/opt/python/cp313-cp313/lib:${PYLIB}:${LIBRARY_PATH}
+    PATH=/opt/python/cp${PYV}-cp${PYV}/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:${PYBIN}:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin:${PYBIN}:/opt/python/cp312-cp312/bin:/opt/python/cp313-cp313/bin:${PYBIN}:${PATH} \
+    LD_LIBRARY_PATH=/opt/python/cp${PYV}-cp${PYV}/lib:/usr/local/lib:/opt/dali/${DALI_BUILD_DIR}:/opt/python/cp38-cp38/lib:/opt/python/cp39-cp39/lib:/opt/python/cp310-cp310/lib:/opt/python/cp311-cp311/lib:${PYLIB}:/opt/python/cp312-cp312/lib:/opt/python/cp313-cp313/lib:${PYLIB}:${LD_LIBRARY_PATH} \
+    LIBRARY_PATH=/opt/python/cp${PYV}-cp${PYV}/lib:/usr/local/lib:/opt/dali/${DALI_BUILD_DIR}:/opt/python/cp38-cp38/lib:/opt/python/cp39-cp39/lib:/opt/python/cp310-cp310/lib:/opt/python/cp311-cp311/lib:${PYLIB}:/opt/python/cp312-cp312/lib:/opt/python/cp313-cp313/lib:${PYLIB}:${LIBRARY_PATH}
 
 RUN ln -s /opt/python/cp${PYV}* /opt/python/v
 
 # install Python bindings and patch it to use the clang we have here
-RUN pip install future setuptools wheel clang==14.0 flake8 bandit astunparse gast dm-tree "black[jupyter]"==24.8.0 && \
+RUN pip install future setuptools wheel clang==14.0 flake8 bandit astunparse gast dm-tree "black[jupyter]"==25.1.0 && \
     PY_CLANG_PATH=$(echo $(pip show clang) | sed 's/.*Location: \(.*\) Requires.*/\1/')/clang/cindex.py && \
     LIBCLANG_PATH=/usr/local/lib/libclang.so && \
     sed -i "s|library_file = None|library_file = \"${LIBCLANG_PATH}\"|" ${PY_CLANG_PATH} && \

docker/Dockerfile.build.aarch64-linux

@@ -46,14 +46,15 @@ RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/
                        libnpp-cross-aarch64-${CUDA_CROSS_VERSION} \
     && \
     rm -rf /var/lib/apt/lists/* && \
+    rm /usr/bin/python3 && ln -s python3.10 /usr/bin/python3 && \
     PYTHON_VER=$(python3 -c "import sys;print(f'{sys.version_info[0]}{sys.version_info[1]}')") && \
     if [ "${PYTHON_VER}" = "36" ]; then \
         curl -O https://bootstrap.pypa.io/pip/3.6/get-pip.py; \
     else \
         curl -O https://bootstrap.pypa.io/get-pip.py; \
     fi && python3 get-pip.py && rm get-pip.py && \
     # decouple libclang and clang installation so libclang changes are not overriden by clang
-    pip install clang==14.0 && pip install libclang==14.0.1 flake8 bandit "black[jupyter]"==24.8.0 && \
+    pip install clang==14.0 && pip install libclang==14.0.1 flake8 bandit "black[jupyter]"==25.1.0 && \
     rm -rf /root/.cache/pip/ && \
     cd /tmp && git clone https://github.com/NixOS/patchelf && cd patchelf && \
     ./bootstrap.sh && ./configure --prefix=/usr/ && make -j install && cd / && rm -rf /tmp/patchelf && \