diff --git a/pre-commit-3.6.0.tar.gz b/pre-commit-3.6.0.tar.gz deleted file mode 100644 index d890063..0000000 --- a/pre-commit-3.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d5c0ad36780cd21141d95c322aacc79b5c2c972e3d6fb70008180524263f56e -size 268891 diff --git a/pre-commit-3.6.2.tar.gz b/pre-commit-3.6.2.tar.gz new file mode 100644 index 0000000..7642f8c --- /dev/null +++ b/pre-commit-3.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d57327523b671524fe0ee9d6c9fe53e1e2790dee3575a0c39f546c310e481d5 +size 269614 diff --git a/python-pre-commit.changes b/python-pre-commit.changes index ee65954..1a6f77f 100644 --- a/python-pre-commit.changes +++ b/python-pre-commit.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Feb 27 17:36:39 UTC 2024 - Ben Greiner + +- Update to 3.6.2 + * Fix building golang hooks during `git commit --all`. +- Changelog for 3.6.1 + * Remove `PYTHONEXECUTABLE` from environment when running. + * Handle staged-files-only with only a crlf diff. +- Build PEP517 wheel +- Skip golang test trying to download dependency + ------------------------------------------------------------------- Wed Jan 3 17:04:33 UTC 2024 - Marina Latini diff --git a/python-pre-commit.spec b/python-pre-commit.spec index 0d25566..96f5549 100644 --- a/python-pre-commit.spec +++ b/python-pre-commit.spec @@ -18,7 +18,7 @@ %{?sle15_python_module_pythons} Name: python-pre-commit -Version: 3.6.0 +Version: 3.6.2 Release: 0 Summary: Multi-language pre-commit hooks License: MIT @@ -27,7 +27,10 @@ Source: https://github.com/pre-commit/pre-commit/archive/v%{version}.tar %if 0%{?sle_version} <= 150600 Group: Development/Tools/Other %endif +BuildRequires: %{python_module base >= 3.9} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-PyYAML >= 5.1 @@ -36,7 +39,7 @@ Requires: python-identify >= 1.0.0 Requires: python-nodeenv >= 0.11.1 Requires: python-virtualenv >= 20.10.0 Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(postun): update-alternatives BuildArch: noarch %if 0%{?sle_version} <= 150600 && 0%{?is_opensuse} BuildRequires: lua53-devel @@ -63,15 +66,15 @@ BuildRequires: git-core A framework for managing and maintaining multi-language pre-commit hooks. %prep -%setup -q -n pre-commit-%{version} +%autosetup -n pre-commit-%{version} sed -i 's|^#!%{_bindir}/env python|#!%{_bindir}/python|' pre_commit/resources/hook-tmpl sed -i 's|^#!%{_bindir}/env bash|#!%{_bindir}/bash|' pre_commit/resources/hook-tmpl %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %python_clone -a %{buildroot}%{_bindir}/pre-commit @@ -99,7 +102,11 @@ EXCLUDED_TESTS="$EXCLUDED_TESTS or test_local_lua_additional_dependencies" # rust_tests use rustup which require network EXCLUDED_TESTS="$EXCLUDED_TESTS or test_local_python_repo_python2 or rust_test" # tests that require network access -EXCLUDED_TESTS="$EXCLUDED_TESTS or test_run_example_executable or test_run_dep or test_perl_additional_dependencies or test_lua_additional_dependencies" +EXCLUDED_TESTS="$EXCLUDED_TESTS or test_run_example_executable" +EXCLUDED_TESTS="$EXCLUDED_TESTS or test_run_dep" +EXCLUDED_TESTS="$EXCLUDED_TESTS or test_perl_additional_dependencies" +EXCLUDED_TESTS="$EXCLUDED_TESTS or test_lua_additional_dependencies" +EXCLUDED_TESTS="$EXCLUDED_TESTS or (golang_test and test_during_commit_all)" # requires swift EXCLUDED_TESTS="$EXCLUDED_TESTS or test_swift_language" %if 0%{?sle_version} <= 150600 @@ -109,8 +116,12 @@ EXCLUDED_TESTS="$EXCLUDED_TESTS or test_perl_install" # Fix issue with git submodule in OBS git config --global --add protocol.file.allow always - git init . + +# Required for python312 https://virtualenv.pypa.io/en/latest/changelog.html#features-20-23-0 +export VIRTUALENV_SETUPTOOLS=bundle +export VIRTUALENV_WHEEL=bundle + %pytest -k "not ($EXCLUDED_TESTS)" %post @@ -124,6 +135,6 @@ git init . %doc CHANGELOG.md %python_alternative %{_bindir}/pre-commit %{python_sitelib}/pre_commit -%{python_sitelib}/pre_commit-%{version}-py*.egg-info +%{python_sitelib}/pre_commit-%{version}.dist-info %changelog