From cf56d72a1b7e4a680269c6699c4584e5452fad03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 15:22:54 +0000 Subject: [PATCH 1/2] Bump pypa/gh-action-pypi-publish from 1.8.7 to 1.8.8 Bumps [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish) from 1.8.7 to 1.8.8. - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](https://github.com/pypa/gh-action-pypi-publish/compare/v1.8.7...v1.8.8) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/deploy-sdist.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-sdist.yaml b/.github/workflows/deploy-sdist.yaml index c2d071c..6ef7dd3 100644 --- a/.github/workflows/deploy-sdist.yaml +++ b/.github/workflows/deploy-sdist.yaml @@ -21,7 +21,7 @@ jobs: - name: Publish package to PyPI if: github.event.action == 'published' - uses: pypa/gh-action-pypi-publish@v1.8.7 + uses: pypa/gh-action-pypi-publish@v1.8.8 with: user: __token__ password: ${{ secrets.pypi_password }} From 3f631d320a8bfd854e6970b3e71c0793d862de35 Mon Sep 17 00:00:00 2001 From: David Hoese Date: Tue, 1 Aug 2023 10:34:01 -0500 Subject: [PATCH 2/2] Fix new flake8 whitespace issues --- libtiff/test_bittools.py | 2 +- libtiff/tests/test_lzw.py | 2 +- libtiff/tiff_image.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libtiff/test_bittools.py b/libtiff/test_bittools.py index 7b26999..a173525 100644 --- a/libtiff/test_bittools.py +++ b/libtiff/test_bittools.py @@ -39,7 +39,7 @@ def test_wordbits(): assert word == arr[0], repr((width, word, arr[0], bstr, dtype)) bittools.setword(arr2, 0, width, word) assert bittools.getword(arr2, 0, width)[0] == word - assert tobinary(arr2)[:width] == bstr[:width],\ + assert tobinary(arr2)[:width] == bstr[:width], \ repr((tobinary(arr2)[:width], bstr[:width])) diff --git a/libtiff/tests/test_lzw.py b/libtiff/tests/test_lzw.py index 135b78d..ca51683 100644 --- a/libtiff/tests/test_lzw.py +++ b/libtiff/tests/test_lzw.py @@ -31,5 +31,5 @@ def test_encode(): rarr = c_encode(arr) arr2 = c_decode(rarr, arr.nbytes) - assert arr2.nbytes == arr.nbytes and (arr2 == arr).all(),\ + assert arr2.nbytes == arr.nbytes and (arr2 == arr).all(), \ repr((arr2, arr)) diff --git a/libtiff/tiff_image.py b/libtiff/tiff_image.py index 2c1bc9e..717370a 100644 --- a/libtiff/tiff_image.py +++ b/libtiff/tiff_image.py @@ -315,7 +315,7 @@ def write_file(self, filename, compression='none', # entries must be sorted by tag number entries.sort(key=lambda x: x.tag) - strip_info = strip_offsets, strip_byte_counts, strips_per_image,\ + strip_info = strip_offsets, strip_byte_counts, strips_per_image, \ rows_per_strip, bytes_per_row image_directories.append((entries, strip_info, image)) @@ -359,7 +359,7 @@ def tif_write(_tif, _offset, _data): start_time = time.time() compressed_data_size = 0 for i, (entries, strip_info, image) in enumerate(image_directories): - strip_offsets, strip_byte_counts, strips_per_image,\ + strip_offsets, strip_byte_counts, strips_per_image, \ rows_per_strip, bytes_per_row = strip_info # write the nof IFD entries