diff --git a/.gitignore b/.gitignore index efa5f06..afb1aae 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /pre-commit-3.3.3.tar.gz /pre-commit-3.4.0.tar.gz /pre-commit-3.5.0.tar.gz +/pre-commit-3.6.0.tar.gz diff --git a/75f2710bd4ffdce232fd1a37e9accbcac3ade14a.patch b/75f2710bd4ffdce232fd1a37e9accbcac3ade14a.patch deleted file mode 100644 index 52a2807..0000000 --- a/75f2710bd4ffdce232fd1a37e9accbcac3ade14a.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 75f2710bd4ffdce232fd1a37e9accbcac3ade14a Mon Sep 17 00:00:00 2001 -From: Anthony Sottile -Date: Sat, 28 Oct 2023 14:39:49 -0400 -Subject: [PATCH] 3.13 removed the simpler importlib.resources api - ---- - pre_commit/languages/ruby.py | 3 ++- - pre_commit/util.py | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/pre_commit/languages/ruby.py b/pre_commit/languages/ruby.py -index 3ed15cfcc..0438ae095 100644 ---- a/pre_commit/languages/ruby.py -+++ b/pre_commit/languages/ruby.py -@@ -25,7 +25,8 @@ - - - def _resource_bytesio(filename: str) -> IO[bytes]: -- return importlib.resources.open_binary('pre_commit.resources', filename) -+ files = importlib.resources.files('pre_commit.resources') -+ return files.joinpath(filename).open('rb') - - - @functools.lru_cache(maxsize=1) -diff --git a/pre_commit/util.py b/pre_commit/util.py -index 1e3112693..8f5958414 100644 ---- a/pre_commit/util.py -+++ b/pre_commit/util.py -@@ -36,7 +36,8 @@ def clean_path_on_failure(path: str) -> Generator[None, None, None]: - - - def resource_text(filename: str) -> str: -- return importlib.resources.read_text('pre_commit.resources', filename) -+ files = importlib.resources.files('pre_commit.resources') -+ return files.joinpath(filename).read_text() - - - def make_executable(filename: str) -> None: diff --git a/pre-commit.spec b/pre-commit.spec index 3c247ec..e3943dd 100644 --- a/pre-commit.spec +++ b/pre-commit.spec @@ -1,8 +1,8 @@ %bcond_without check Name: pre-commit -Version: 3.5.0 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: Framework for managing and maintaining multi-language pre-commit hooks # SPDX @@ -12,8 +12,6 @@ Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-% BuildArch: noarch -Patch: https://github.com/%{name}/%{name}/commit/75f2710bd4ffdce232fd1a37e9accbcac3ade14a.patch - BuildRequires: python3-devel %if %{with check} @@ -198,6 +196,9 @@ k="${k-}${k+ and }not test_run_a_ruby_hook" %changelog +* Tue Dec 19 2023 Benjamin A. Beasley - 3.6.0-1 +- Update to 3.6.0 (close RHBZ#2253802) + * Fri Nov 03 2023 Benjamin A. Beasley - 3.5.0-2 - Patch for Python 3.13 (close RHBZ#2247263) diff --git a/sources b/sources index 687b043..673f490 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pre-commit-3.5.0.tar.gz) = c7504fa2d3ba70def3361af0fcc2f7a5454325125e27f44fbaa60906f1ac35b0fa1b646eaf326cb04d4d042ecb6786fbb8e9166099df1e687fa2a64a8113c244 +SHA512 (pre-commit-3.6.0.tar.gz) = 4997dfe15d262b8d0c6de711b2543162fffe14f24ce41d3a3ba2014354861ef72eb3a9cc115125ed57ef3c25a12886f858189d684d343252ad8f46cc0c364935