From c93725ac58fef240004c26422c429340ef12e41a Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 5 Mar 2026 21:37:06 +0900 Subject: [PATCH] internal/rosa: prefix python constants These have confusing names. Signed-off-by: Ophestra --- internal/rosa/all.go | 10 +++++----- internal/rosa/fuse.go | 10 +++++----- internal/rosa/gtk.go | 2 +- internal/rosa/python.go | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/rosa/all.go b/internal/rosa/all.go index c7d39b7..a550b7b 100644 --- a/internal/rosa/all.go +++ b/internal/rosa/all.go @@ -61,7 +61,6 @@ const ( Gzip Hakurei HakureiDist - IniConfig Kmod LibXau Libcap @@ -89,7 +88,6 @@ const ( Ninja OpenSSL PCRE2 - Packaging Patch Perl PerlLocaleGettext @@ -103,11 +101,13 @@ const ( PerlUnicodeGCString PerlYAMLTiny PkgConfig - Pluggy Procps - PyTest - Pygments Python + PythonIniConfig + PythonPackaging + PythonPluggy + PythonPyTest + PythonPygments QEMU Rsync Sed diff --git a/internal/rosa/fuse.go b/internal/rosa/fuse.go index 22c7cab..62b971c 100644 --- a/internal/rosa/fuse.go +++ b/internal/rosa/fuse.go @@ -24,11 +24,11 @@ func (t Toolchain) newFuse() (pkg.Artifact, string) { // this project uses pytest SkipTest: true, }, - IniConfig, - Packaging, - Pluggy, - Pygments, - PyTest, + PythonIniConfig, + PythonPackaging, + PythonPluggy, + PythonPygments, + PythonPyTest, KernelHeaders, ), version diff --git a/internal/rosa/gtk.go b/internal/rosa/gtk.go index 221a390..772e9ee 100644 --- a/internal/rosa/gtk.go +++ b/internal/rosa/gtk.go @@ -40,7 +40,7 @@ func (t Toolchain) newGLib() (pkg.Artifact, string) { }, }, XZ, - Packaging, + PythonPackaging, Bash, PCRE2, diff --git a/internal/rosa/python.go b/internal/rosa/python.go index 683f37e..1282f8f 100644 --- a/internal/rosa/python.go +++ b/internal/rosa/python.go @@ -139,7 +139,7 @@ func init() { } func init() { - artifactsM[Pygments] = newViaPip( + artifactsM[PythonPygments] = newViaPip( "pygments", " a syntax highlighting package written in Python", "2.19.2", "none", "any", @@ -148,7 +148,7 @@ func init() { "c7/21/705964c7812476f378728bdf590ca4b771ec72385c533964653c68e86bdc/", ) - artifactsM[Pluggy] = newViaPip( + artifactsM[PythonPluggy] = newViaPip( "pluggy", "the core framework used by the pytest, tox, and devpi projects", "1.6.0", "none", "any", @@ -157,7 +157,7 @@ func init() { "54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/", ) - artifactsM[Packaging] = newViaPip( + artifactsM[PythonPackaging] = newViaPip( "packaging", "reusable core utilities for various Python Packaging interoperability specifications", "26.0", "none", "any", @@ -166,7 +166,7 @@ func init() { "b7/b9/c538f279a4e237a006a2c98387d081e9eb060d203d8ed34467cc0f0b9b53/", ) - artifactsM[IniConfig] = newViaPip( + artifactsM[PythonIniConfig] = newViaPip( "iniconfig", "a small and simple INI-file parser module", "2.3.0", "none", "any", @@ -174,16 +174,16 @@ func init() { "https://files.pythonhosted.org/packages/"+ "cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/", ) - artifactsM[PyTest] = newViaPip( + artifactsM[PythonPyTest] = newViaPip( "pytest", "the pytest framework", "9.0.2", "none", "any", "IM2wDbLke1EtZhF92zvAjUl_Hms1uKDtM7U8Dt4acOaChMnDg1pW7ib8U0wYGDLH", "https://files.pythonhosted.org/packages/"+ "3b/ab/b3226f0bd7cdcf710fbede2b3548584366da3b19b5021e74f5bde2a8fa3f/", - IniConfig, - Packaging, - Pluggy, - Pygments, + PythonIniConfig, + PythonPackaging, + PythonPluggy, + PythonPygments, ) }