py-ruff: small progress, different error now

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Thu May 4 22:52:57 2023 +0200
Changeset:	09eb13adea857ec3d18d642f8ceba80e4edbe2f7

Modified Files:
	py-ruff/TODO
	py-ruff/distinfo
Added Files:
	py-ruff/patches/patch-crates_ruff__cli_Cargo.toml
	py-ruff/patches/patch-local__dependencies_ruff_Cargo.toml

Log Message:
py-ruff: small progress, different error now

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=09eb13adea857ec3d18d642f8ceba80e4edbe2f7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-ruff/TODO                                       | 14 +++------
 py-ruff/distinfo                                   |  2 ++
 py-ruff/patches/patch-crates_ruff__cli_Cargo.toml  | 15 ++++++++++
 .../patch-local__dependencies_ruff_Cargo.toml      | 35 ++++++++++++++++++++++
 4 files changed, 56 insertions(+), 10 deletions(-)

diffs:
diff --git a/py-ruff/TODO b/py-ruff/TODO
index 1d128f4574..0c7f698755 100644
--- a/py-ruff/TODO
+++ b/py-ruff/TODO
@@ -1,15 +1,9 @@
 * Building wheel...
 Running `maturin-3.11 pep517 build-wheel -i /usr/pkg/bin/python3.11 --compatibility off`
-error: failed to get `ruff_text_size` as a dependency of package `ruff_cli v0.0.264 (/scratch/wip/py-ruff/work/ruff-0.0.264/crates/ruff_cli)`
-
-Caused by:
-  failed to load source for dependency `ruff_text_size`
-
-Caused by:
-  Unable to update https://github.com/charliermarsh/RustPython.git?rev=c3147d2c1524ebd0e90cf1c2938d770314fd5a5a#c3147d2c
-
-Caused by:
-  can't checkout from 'https://github.com/charliermarsh/RustPython.git': you are in the offline mode (--offline)
+error: no matching package named `rustc-hash` found
+location searched: registry `crates-io`
+required by package `ruff_cli v0.0.264 (/scratch/wip/py-ruff/work/ruff-0.0.264/crates/ruff_cli)`
+As a reminder, you're using offline mode (--offline) which can sometimes cause surprising resolution failures, if this error is too confusing you may wish to retry without the offline flag.
 💥 maturin failed
   Caused by: Cargo metadata failed. Does your crate compile with `cargo build`?
   Caused by: `cargo metadata` exited with an error: 
diff --git a/py-ruff/distinfo b/py-ruff/distinfo
index 5b220b1617..c3185490fd 100644
--- a/py-ruff/distinfo
+++ b/py-ruff/distinfo
@@ -1038,3 +1038,5 @@ Size (yansi-0.5.1.crate) = 16525 bytes
 BLAKE2s (yansi-term-0.1.2.crate) = 2813445385a77c8a145f5e18e9f21db4290e5676c82e8b3f8581e65e1e101135
 SHA512 (yansi-term-0.1.2.crate) = ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6
 Size (yansi-term-0.1.2.crate) = 14342 bytes
+SHA1 (patch-crates_ruff__cli_Cargo.toml) = d204477e860437ba4475c393fcc6f6714837cb26
+SHA1 (patch-local__dependencies_ruff_Cargo.toml) = 3bac00cacdbc71a3f36c8e5a6d6d06a83f2cfa7c
diff --git a/py-ruff/patches/patch-crates_ruff__cli_Cargo.toml b/py-ruff/patches/patch-crates_ruff__cli_Cargo.toml
new file mode 100644
index 0000000000..8464d5bbe8
--- /dev/null
+++ b/py-ruff/patches/patch-crates_ruff__cli_Cargo.toml
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Provide unpublished crate.
+
+--- crates/ruff_cli/Cargo.toml.orig	1970-01-01 00:00:00.000000000 +0000
++++ crates/ruff_cli/Cargo.toml
+@@ -26,7 +26,7 @@ ruff = { path = "../../local_dependencie
+ ruff_cache = { path = "../../local_dependencies/ruff_cache" }
+ ruff_diagnostics = { path = "../../local_dependencies/ruff_diagnostics" }
+ ruff_python_ast = { path = "../../local_dependencies/ruff_python_ast" }
+-ruff_text_size = { git = "https://github.com/charliermarsh/RustPython.git";, rev = "c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" }
++ruff_text_size = { path = "../../ruff_text_size" }
+ 
+ annotate-snippets = { version = "0.9.1", features = ["color"] }
+ anyhow = { version = "1.0.69" }
diff --git a/py-ruff/patches/patch-local__dependencies_ruff_Cargo.toml b/py-ruff/patches/patch-local__dependencies_ruff_Cargo.toml
new file mode 100644
index 0000000000..aebf64db4a
--- /dev/null
+++ b/py-ruff/patches/patch-local__dependencies_ruff_Cargo.toml
@@ -0,0 +1,35 @@
+$NetBSD$
+
+Provide unpublished crate.
+
+--- local_dependencies/ruff/Cargo.toml.orig	1970-01-01 00:00:00.000000000 +0000
++++ local_dependencies/ruff/Cargo.toml
+@@ -21,7 +21,7 @@ ruff_python_ast = { path = "../ruff_pyth
+ ruff_python_semantic = { path = "../ruff_python_semantic" }
+ ruff_python_stdlib = { path = "../ruff_python_stdlib" }
+ ruff_rustpython = { path = "../ruff_rustpython" }
+-ruff_text_size = { git = "https://github.com/charliermarsh/RustPython.git";, rev = "c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" }
++ruff_text_size = { path = "../../ruff_text_size" }
+ 
+ annotate-snippets = { version = "0.9.1", features = ["color"] }
+ anyhow = { version = "1.0.69" }
+@@ -37,7 +37,7 @@ ignore = { version = "0.4.20" }
+ imperative = { version = "1.0.4" }
+ is-macro = { version = "0.2.2" }
+ itertools = { version = "0.10.5" }
+-libcst = { git = "https://github.com/charliermarsh/LibCST";, rev = "80e4c1399f95e5beb532fdd1e209ad2dbb470438" }
++libcst = { path = "../../LibCST-80e4c1399f95e5beb532fdd1e209ad2dbb470438" }
+ log = { version = "0.4.17" }
+ natord = { version = "1.0.9" }
+ nohash-hasher = { version = "0.2.0" }
+@@ -53,8 +53,8 @@ quick-junit = { version = "0.3.2" }
+ regex = { version = "1.7.1" }
+ result-like = { version = "0.4.6" }
+ rustc-hash = { version = "1.1.0" }
+-rustpython-common = { git = "https://github.com/charliermarsh/RustPython.git";, rev = "c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" }
+-rustpython-parser = { git = "https://github.com/charliermarsh/RustPython.git";, rev = "c3147d2c1524ebd0e90cf1c2938d770314fd5a5a" }
++rustpython-common = { version = "0.2.0" }
++rustpython-parser = { version = "0.2.0" }
+ schemars = { version = "0.8.12" }
+ semver = { version = "1.0.16" }
+ serde = { version = "1.0.152", features = ["derive"] }