[rpms/ruff] f43: Update to 0.15.17

[Benjamin A. Beasley <code@musicinmybrain.net>]

A new commit has been pushed.

Repo   : rpms/ruff
Branch : f43
Commit : cf9a8c95864e12ecb8da9f25eb0cb344fff38b5b
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-06-21T20:19:02+01:00
Stats  : +13/-60 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/ruff/c/cf9a8c95864e12ecb8da9f25eb0cb344fff38b5b?branch=f43

Log:
Update to 0.15.17

---
diff --git a/.gitignore b/.gitignore
index d8f905e..9547600 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,3 +92,4 @@
 /ruff-0.15.14.tar.gz
 /ruff-0.15.15.tar.gz
 /ruff-0.15.16.tar.gz
+/ruff-0.15.17.tar.gz

diff --git a/ruff.spec b/ruff.spec
index ffd5eb4..ea19acd 100644
--- a/ruff.spec
+++ b/ruff.spec
@@ -1,7 +1,7 @@
 %bcond check 1
 
 Name:           ruff
-Version:        0.15.16
+Version:        0.15.17
 # The ruff package has a permanent exception to the Updates Policy in Fedora,
 # so it can be updated in stable releases across SemVer boundaries (subject to
 # good judgement and actual compatibility of any reverse dependencies). See
@@ -66,9 +66,6 @@ Summary:        Extremely fast Python linter and code formatter
 # Apache-2.0 OR MIT:
 #   - crates/ruff_annotate_snippets/ is a fork of the annotate-snippets crate
 #
-# MIT:
-#   - lsp-types, Source200
-#
 # =====
 #
 # A few other source files carry their own licenses but do not fit into the
@@ -151,32 +148,12 @@ License:        %{shrink:
 URL:            https://github.com/astral-sh/ruff
 Source:         %{url}/archive/%{version}/ruff-%{version}.tar.gz
 
-# Currently, ruff must use a fork of lsp-types
-# (https://github.com/gluon-lang/lsp-types), as explained in:
-#   Add README disclaimer
-#   https://github.com/gluon-lang/lsp-types/commit/ddc7dc8
-# which says,
-#   This fork is a temporary solution for supporting Jupyter Notebooks for our
-#   new LSP server, `ruff server`.
-#   This fork is not actively maintained by Astral.
-# We asked for a status update in:
-#   Path to not forking lsp-types?
-#   https://github.com/astral-sh/ruff/issues/20449
-# Upstream has not ruled out “unforking,” but indicates they are in no
-# particular hurry to do so. We therefore bundle the fork as prescribed in:
-#   https://docs.fedoraproject.org/en-US/packaging-guidelines/Rust/#_replacing_git_dependencies
-%global lsp_types_git https://github.com/astral-sh/lsp-types
-%global lsp_types_rev e15db0593f0ecbbd80599c3f5880e4bf5da1ca0c
-%global lsp_types_baseversion 0.95.1
-%global lsp_types_snapdate 20260220
-Source200:      %{lsp_types_git}/archive/%{lsp_types_rev}/lsp-types-%{lsp_types_rev}.tar.gz
-
 # Get this from crates/ty_vendored/vendor/typeshed/source_commit.txt.
-%global typeshed_rev 4a47505dd891ac8a94ba7f4b578899c72727ce23
+%global typeshed_rev 32b95c1f59aa2c8edd7f2a5fd3bdfeed639ee1a7
 # The typeshed project as a whole has never been versioned.
 %global typeshed_baseversion 0
 # Inspect https://github.com/python/typeshed/commit/%%{typeshed_rev}.
-%global typeshed_snapdate 20260531
+%global typeshed_snapdate 20260610
 
 # Downstream patch: always find the system-wide ruff executable
 #
@@ -203,11 +180,6 @@ BuildRequires:  cargo-rpm-macros >= 24
 BuildRequires:  rust2rpm-helper
 BuildRequires:  tomcli
 
-# This is a fork of lsp-types; see the notes about Source200.
-%global lsp_types_snapinfo %{lsp_types_snapdate}git%{sub %{lsp_types_rev} 1 7}
-%global lsp_types_version %{lsp_types_baseversion}^%{lsp_types_snapinfo}
-Provides:       bundled(crate(lsp-types)) = %{lsp_types_version}
-
 # This is not versioned or released as a whole, and it is normal for
 # type-checkers to vendor it. See
 # https://typing.python.org/en/latest/spec/distributing.html#the-typeshed-project.
@@ -237,10 +209,6 @@ Provides:       bundled(typeshed) = %{typeshed_version}
 #   [`annotate-snippets` crate]: https://github.com/rust-lang/annotate-snippets-rs
 Provides:       bundled(crate(annotate-snippets)) = 0.11.5
 
-# forked from lsp-types upstream: https://github.com/gluon-lang/lsp-types
-# with changes applied:           https://github.com/astral-sh/lsp-types/tree/notebook-support
-Provides:       bundled(crate(lsp-types)) = 0.95.1
-
 %global common_description %{expand:
 An extremely fast Python linter and code formatter, written in Rust.
 
@@ -267,31 +235,9 @@ This package provides an importable Python module for ruff.
 
 
 %prep
-%autosetup -N
-%autopatch -p1 -M99
-
+%autosetup -p1
 %cargo_prep
 
-# Usage: git2path SELECTOR PATH
-# Replace a git dependency with a path dependency in Cargo.toml
-git2path() {
-  tomcli set Cargo.toml del "${1}.git"
-  tomcli set Cargo.toml del "${1}.rev"
-  tomcli set Cargo.toml str "${1}.path" "${2}"
-}
-
-# See comments above Source200:
-%setup -q -T -D -b 200 -n ruff-%{version}
-# Adding the crate to the workspace (in this case implicitly, by moving it
-# under crates/) means %%cargo_generate_buildrequires can handle it correctly.
-mv ../lsp-types-%{lsp_types_rev} crates/lsp-types
-git2path workspace.dependencies.lsp-types crates/lsp-types
-pushd crates/lsp-types
-%autopatch -p1 -m200 -M299
-popd
-install -D --preserve-timestamps --mode=0644 \
-    --target=LICENSE.bundled/lsp-types crates/lsp-types/LICENSE
-
 # Loosen some version bounds. We retain this comment and the following example
 # even when there are currently no dependencies that need to be adjusted.
 #
@@ -317,6 +263,13 @@ tomcli set Cargo.toml str workspace.dependencies.get-size2.version \
 tomcli set Cargo.toml str workspace.dependencies.tikv-jemallocator.version \
     '>=0.6.0, <0.8.0'
 
+# zip
+#   wanted: 5.1
+#   currently packaged: 8.5.1
+# See discussion in https://github.com/astral-sh/ruff/pull/25812.
+tomcli set Cargo.toml str workspace.dependencies.zip.version \
+    '>=5.1, <9.0'
+
 # Collect license files of vendored dependencies in the main source archive
 install -D --preserve-timestamps --mode=0644 \
     --target=LICENSE.bundled/typeshed \

diff --git a/sources b/sources
index c1751eb..c2be7f6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (ruff-0.15.16.tar.gz) = 148685d402f7a8b901f03ef12805e83bc7f6a99180587f092bddc9142b15c07092870ab97420d29d9a6cd1bef2be4f0d6c3caf4e147783742c1ffbf82349de26
-SHA512 (lsp-types-e15db0593f0ecbbd80599c3f5880e4bf5da1ca0c.tar.gz) = 097e4371ebde03c5f80e4f2c0eaf8354ce53c0472170536df5a155b33d19a4c20a498aa67684c7a764af31115cae02ec42c463044972d4dece7449ea241d6970
+SHA512 (ruff-0.15.17.tar.gz) = 98cb72f936e708f10d4af6f986e2c64acee403784a931d8a6c15db8f51f63c8f0684159af674a895c6f74ad265b46775b3dc8e6dd2e7f9db18640142ebd96fd1