From 234a49e9ad277d56ebdb2c79f5e49a2c7d55efda Mon Sep 17 00:00:00 2001 From: Chris Green Date: Tue, 2 Aug 2022 11:10:57 -0500 Subject: [PATCH 1/3] py-platformdirs: sanitize UTF-8 setup.cfg on Python 3.6 --- .../builtin/packages/py-platformdirs/package.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/var/spack/repos/builtin/packages/py-platformdirs/package.py b/var/spack/repos/builtin/packages/py-platformdirs/package.py index c1de5eb2c32b91..56f76759e897b9 100644 --- a/var/spack/repos/builtin/packages/py-platformdirs/package.py +++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py @@ -13,8 +13,21 @@ class PyPlatformdirs(PythonPackage): homepage = "https://github.com/platformdirs/platformdirs" pypi = "platformdirs/platformdirs-2.4.0.tar.gz" + version('2.4.1', sha256='440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda') version("2.4.0", sha256="367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2") + version('2.3.0', sha256='15b056538719b1c94bdaccb29e5f81879c7f7f0f4a153f46086d155dffcd4f0f') + depends_on("python@3.7:", when="@2.4.1:", type=("build", "run")) depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools@44:", type="build") depends_on("py-setuptools-scm@5:+toml", type="build") + + + @when("^python@:3.6") + @run_before("install") + def handle_utf8_setup_cfg(self): + """Sanitize setup.cfg to resolve issues with Python 3.6 and UTF-8""" + with open("setup.cfg", mode="r", encoding="utf-8") as input_file: + cfg = input_file.readlines() + with open("setup.cfg", mode="w", encoding="ascii", errors="backslashreplace") as output_file: + output_file.writelines(cfg) From 41ac8a272830dea46f795f4623ea9580885c9ad9 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Tue, 2 Aug 2022 11:12:34 -0500 Subject: [PATCH 2/3] py-platformdirs: black compliance --- .../repos/builtin/packages/py-platformdirs/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-platformdirs/package.py b/var/spack/repos/builtin/packages/py-platformdirs/package.py index 56f76759e897b9..559329e45fa866 100644 --- a/var/spack/repos/builtin/packages/py-platformdirs/package.py +++ b/var/spack/repos/builtin/packages/py-platformdirs/package.py @@ -13,21 +13,22 @@ class PyPlatformdirs(PythonPackage): homepage = "https://github.com/platformdirs/platformdirs" pypi = "platformdirs/platformdirs-2.4.0.tar.gz" - version('2.4.1', sha256='440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda') + version("2.4.1", sha256="440633ddfebcc36264232365d7840a970e75e1018d15b4327d11f91909045fda") version("2.4.0", sha256="367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2") - version('2.3.0', sha256='15b056538719b1c94bdaccb29e5f81879c7f7f0f4a153f46086d155dffcd4f0f') + version("2.3.0", sha256="15b056538719b1c94bdaccb29e5f81879c7f7f0f4a153f46086d155dffcd4f0f") depends_on("python@3.7:", when="@2.4.1:", type=("build", "run")) depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools@44:", type="build") depends_on("py-setuptools-scm@5:+toml", type="build") - @when("^python@:3.6") @run_before("install") def handle_utf8_setup_cfg(self): """Sanitize setup.cfg to resolve issues with Python 3.6 and UTF-8""" with open("setup.cfg", mode="r", encoding="utf-8") as input_file: cfg = input_file.readlines() - with open("setup.cfg", mode="w", encoding="ascii", errors="backslashreplace") as output_file: + with open( + "setup.cfg", mode="w", encoding="ascii", errors="backslashreplace" + ) as output_file: output_file.writelines(cfg) From 1c12dafa354b01eecd14f94e5973b99a63001fbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Aug 2022 16:44:27 +0000 Subject: [PATCH 3/3] build(deps): bump docker/build-push-action from 3.0.0 to 3.1.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/e551b19e49efd4e98792db7592c17c09b89db8d8...1cb9d22b932e4832bb29793b7777ec860fc1cde0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 90e01b67af5d75..1286530815f94d 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -106,7 +106,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build & Deploy ${{ matrix.dockerfile[0] }} - uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 # @v2 + uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 # @v2 with: context: dockerfiles/${{ matrix.dockerfile[0] }} platforms: ${{ matrix.dockerfile[1] }}