diff --git a/.gitignore b/.gitignore index 598ed49..3a7e6fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/watchfiles-0.20.0.tar.gz +SOURCES/watchfiles-1.0.3.tar.gz diff --git a/.python-watchfiles.metadata b/.python-watchfiles.metadata index 9b5776e..4ac6ee3 100644 --- a/.python-watchfiles.metadata +++ b/.python-watchfiles.metadata @@ -1 +1 @@ -5ee3164398a68c85a5e884c79fc4b326ec05c8ff SOURCES/watchfiles-0.20.0.tar.gz +349ef2faa7c55cca60c2135359c866b7fed0547d SOURCES/watchfiles-1.0.3.tar.gz diff --git a/SOURCES/318442aa2bfb38cf2fa81165ee1e3fe5aa70494b.patch b/SOURCES/318442aa2bfb38cf2fa81165ee1e3fe5aa70494b.patch new file mode 100644 index 0000000..77e38d2 --- /dev/null +++ b/SOURCES/318442aa2bfb38cf2fa81165ee1e3fe5aa70494b.patch @@ -0,0 +1,23 @@ +From 318442aa2bfb38cf2fa81165ee1e3fe5aa70494b Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Thu, 2 Jan 2025 10:14:02 -0500 +Subject: [PATCH] Update notify from a 6.1.1 fork to 7.0.0 + +- Fixes #312. +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 8f03606..dcd55ed 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -25,7 +25,7 @@ rust-version = "1.63" + + [dependencies] + crossbeam-channel = "0.5.12" +-notify = {git = "https://github.com/samuelcolvin/notify.git", branch = "keep-io-error"} ++notify = { version = "7.0.0" } + pyo3 = { version = "0.23.3", features = ["extension-module", "generate-import-lib"] } + + [lib] diff --git a/SPECS/python-watchfiles.spec b/SPECS/python-watchfiles.spec index 66056c6..7b65212 100644 --- a/SPECS/python-watchfiles.spec +++ b/SPECS/python-watchfiles.spec @@ -1,15 +1,15 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.6.5) +## (rpmautospec version 0.7.3) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 5; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec Name: python-watchfiles -Version: 0.20.0 +Version: 1.0.3 Release: %autorelease Summary: Simple, modern and high performance file watching and code reload in python # The main source code is under the MIT license. See the license field of the @@ -19,8 +19,14 @@ License: MIT URL: https://github.com/samuelcolvin/watchfiles Source: %{pypi_source watchfiles} +# Use notify 7.0.0 instead of a fork of 6.1.1 +# https://github.com/samuelcolvin/watchfiles/pull/322 +# (We take only the commit changing Cargo.toml, not the one updating +# Cargo.lock.) +Patch: %{url}/pull/322/commits/318442aa2bfb38cf2fa81165ee1e3fe5aa70494b.patch + BuildRequires: python3-devel -BuildRequires: rust-packaging +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: Simple, modern and high performance file watching and code reload in python. @@ -32,16 +38,34 @@ Underlying file system notifications are handled by the Notify rust library.} %package -n python3-watchfiles Summary: %{summary} -# The main source code is under the MIT license. This license field includes -# the licenses of statically linked rust dependencies. -License: MIT AND Apache-2.0 AND CC0-1.0 AND ISC AND (MIT OR Apache-2.0) AND (Unlicense OR MIT) +# The main source code is under the MIT license. This license field includes +# the licenses of statically linked rust dependencies, based on the output of +# %%{cargo_license_summary}: +# +# (MIT OR Apache-2.0) AND CC0-1.0 +# Apache-2.0 OR MIT +# BSD-3-Clause +# CC0-1.0 +# ISC +# MIT +# MIT OR Apache-2.0 +# Unlicense OR MIT +License: %{shrink: + MIT AND + Apache-2.0 AND + BSD-3-Clause AND + CC0-1.0 AND + ISC AND + (MIT OR Apache-2.0) AND + (Unlicense OR MIT) + } %description -n python3-watchfiles %_description %prep -%autosetup -n watchfiles-%{version} +%autosetup -n watchfiles-%{version} -p1 # Remove unnecessary Python test requirements sed -e '/^coverage\b/d' \ @@ -52,6 +76,10 @@ sed -e '/^coverage\b/d' \ # Remove pytest timeout config sed -e '/timeout =/d' -i pyproject.toml +# Remove "generate-import-lib" feature for pyo3; applicable only on Windows, +# and not packaged. +sed -e 's/\(pyo3.*\), "generate-import-lib"/\1/' -i Cargo.toml + # Remove unused Cargo config that contains buildflags for Darwin rm .cargo/config.toml @@ -93,10 +121,13 @@ sed -e '/LICENSE/ s/^/%%license /' -i %{pyproject_files} %changelog -* Sat Jan 04 2025 Arkady L. Shane - 0.20.0-5 +* Sun Jan 05 2025 Arkady L. Shane - 1.0.3-1 - Rebuilt for MSVSphere 10 ## START: Generated by rpmautospec +* Fri Jan 03 2025 Benjamin A. Beasley - 1.0.3-1 +- Update to 1.0.3 + * Fri Jul 19 2024 Fedora Release Engineering - 0.20.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild