Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ansible-lint, yamllint: Update revision and interpreter to python3.13 #27172

Merged
merged 5 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions devel/yamllint/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup python 1.0

github.setup adrienverge yamllint 1.35.1 v
github.tarball_from archive
revision 0
revision 1

categories devel python
supported_archs noarch
Expand All @@ -26,7 +26,7 @@ checksums rmd160 5b1bec2ac73695302aae0009cdf19429174757ae \

# Keep Python version compatible with ansible-lint

python.default_version 311
python.default_version 313

depends_build port:py${python.version}-setuptools
depends_run port:py${python.version}-pathspec \
Expand Down
10 changes: 5 additions & 5 deletions python/py-bracex/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ PortSystem 1.0
PortGroup python 1.0

name py-bracex
version 2.4
version 2.5.post1
revision 0
python.versions 39 310 311
python.versions 39 310 311 312 313

license MIT
platforms {darwin any}
Expand All @@ -18,8 +18,8 @@ long_description {*}${description} Brace expanding is used to generate \
arbitrary strings.
homepage https://github.com/facelessuser/bracex

checksums rmd160 02790d8535f44c3c7c4c9a50c7d2bf3387c89143 \
sha256 a27eaf1df42cf561fed58b7a8f3fdf129d1ea16a81e1fadd1d17989bc6384beb \
size 26588
checksums rmd160 186644ff63e1922218bd21b2c50771dde7a3b9a5 \
sha256 12c50952415bfa773d2d9ccb8e79651b8cdb1f31a42f6091b804f6ba2b4a66b6 \
size 26641

python.pep517_backend hatch
2 changes: 1 addition & 1 deletion python/py-enrich/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PortGroup python 1.0
name py-enrich
version 1.2.7
revision 0
python.versions 39 310 311
python.versions 39 310 311 312 313

license MIT
platforms {darwin any}
Expand Down
10 changes: 5 additions & 5 deletions python/py-wcmatch/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup python 1.0

name py-wcmatch
version 8.5.2
version 10.0
revision 0

license MIT
Expand All @@ -19,11 +19,11 @@ long_description \
features found in Bash.
homepage https://github.com/facelessuser/wcmatch

checksums rmd160 3afe40600e68212a84726e351e7ed6f84f25988e \
sha256 a70222b86dea82fb382dd87b73278c10756c138bd6f8f714e2183128887b9eb2 \
size 114983
checksums rmd160 ebec804ac8367ff1c47e41126c1c032cbc55f53a \
sha256 e72f0de09bba6a04e0de70937b0cf06e55f36f37b3deb422dfaf854b867b840a \
size 115578

python.versions 39 310 311
python.versions 39 310 311 312 313
python.pep517_backend hatch

if {${name} ne ${subport}} {
Expand Down
19 changes: 10 additions & 9 deletions sysutils/ansible-lint/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup python 1.0
PortGroup github 1.0

github.setup ansible-community ansible-lint 24.2.3 v
github.setup ansible-community ansible-lint 25.1.1 v
github.tarball_from archive
revision 0

Expand All @@ -20,12 +20,12 @@ description Best practices checker for Ansible playbooks
long_description \
ansible-lint checks playbooks for practices and behaviour that could potentially be improved

checksums rmd160 2310f060e3d82bab5909cfb30a5349524850efdf \
sha256 b934f8de0431c78f73c206ba17b1f47771be4f95fa2fc41204256eece5bf4e6c \
size 460489
checksums rmd160 0f3046fa0f73aaa9ff25caa7a613e9352f300556 \
sha256 472b8bba3063320c0a68ea616f5f7c675530427e0173d19e12da3b44fda349fd \
size 491974

# Keep Python version compatible with yamllint
python.default_version 311
python.default_version 313
python.link_binaries_suffix

depends_build-append \
Expand All @@ -37,6 +37,7 @@ depends_build-append \
depends_run-append port:py${python.version}-ansible \
port:py${python.version}-ansible-compat \
port:py${python.version}-black \
port:py${python.version}-importlib-metadata\
jhoyt4 marked this conversation as resolved.
Show resolved Hide resolved
port:yamllint

depends_lib-append port:py${python.version}-enrich \
Expand All @@ -49,10 +50,10 @@ depends_lib-append port:py${python.version}-enrich \
port:py${python.version}-wcmatch \
port:py${python.version}-yaml

# Stop setuptools from using the scm version which doesn't exist in this context
patchfiles patch-disable_use_scm_version.diff

python.pep517 yes
# patch-disable_use_scm_version.diff: Stop setuptools from using the scm version which doesn't exist in this context
# patch-disable_path_warning.diff: Correct wanring logic where an empty PYENV_VIRTUAL_ENV triggers a warning
patchfiles patch-disable_use_scm_version.diff \
patch-disable_path_warning.diff

github.livecheck.regex {([0-9.]+)}

Expand Down
11 changes: 11 additions & 0 deletions sysutils/ansible-lint/files/patch-disable_path_warning.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- ./src/ansiblelint/__main__.py.orig 2025-01-30 06:43:48
+++ ./src/ansiblelint/__main__.py 2025-01-30 19:02:17
@@ -456,7 +456,7 @@
if (parent / "ansible").exists() and str(parent) not in paths:
inject_paths.append(str(parent))

- if not os.environ.get("PYENV_VIRTUAL_ENV", None):
+ if not os.environ.get("PYENV_VIRTUAL_ENV","NONE"):
if inject_paths and not all("pipx" in p for p in inject_paths):
print( # noqa: T201
f"WARNING: PATH altered to include {', '.join(inject_paths)} :: This is usually a sign of broken local setup, which can cause unexpected behaviors.",