Hi ports@
[cc rpointel@ as maintainer]
update for devel/py-yamllint to the latest version 1.37.0
Changelog: https://github.com/adrienverge/yamllint/blob/master/CHANGELOG.rst
- update Makefile, distinfo and pkg/PLIST for this version
- Makefile: add HOMEPAGE (GH URL)
- add patches to fix tests (see
https://github.com/adrienverge/yamllint/pull/736)
Build and tests OK on current/amd64 with Python 3.12.9.
Tests welcome and please commit if OK.
Laurent
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-yamllint/Makefile,v
diff -u -p -r1.27 Makefile
--- Makefile 21 Dec 2024 11:40:14 -0000 1.27
+++ Makefile 28 Apr 2025 13:36:54 -0000
@@ -1,13 +1,14 @@
COMMENT = linter for YAML files
-MODPY_DISTV = 1.35.1
+MODPY_DISTV = 1.37.0
DISTNAME = yamllint-${MODPY_DISTV}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = devel
MAINTAINER = Remi Pointel <rpoin...@openbsd.org>
+
+HOMEPAGE = https://github.com/adrienverge/yamllint
# GPLv3+
PERMIT_PACKAGE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-yamllint/distinfo,v
diff -u -p -r1.14 distinfo
--- distinfo 13 Jun 2024 15:35:22 -0000 1.14
+++ distinfo 28 Apr 2025 13:36:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (yamllint-1.35.1.tar.gz) = egA4CfiDJP0sh3c08tV17niB3ZBDNgZXzIBJyAnrps0=
-SIZE (yamllint-1.35.1.tar.gz) = 134583
+SHA256 (yamllint-1.37.0.tar.gz) = 6tgZIdTYchayUot6BVZkcI+fuCZ76wxCfLcGrGq5NYA=
+SIZE (yamllint-1.37.0.tar.gz) = 141202
Index: patches/patch-tests_common_py
===================================================================
RCS file: patches/patch-tests_common_py
diff -N patches/patch-tests_common_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_common_py 28 Apr 2025 13:36:54 -0000
@@ -0,0 +1,15 @@
+Fix tests for version 1.37.0
+Patch from https://github.com/adrienverge/yamllint/pull/736
+
+Index: tests/common.py
+--- tests/common.py.orig
++++ tests/common.py
+@@ -104,7 +104,7 @@ def is_test_codec(codec):
+ return codec in test_codec_infos.keys()
+
+
+-def test_codec_built_in_equivalent(test_codec):
++def built_in_equivalent_of_test_codec(test_codec):
+ return_value = test_codec
+ for suffix in ('_sig', '_be', '_le'):
+ return_value = return_value.replace(suffix, '')
Index: patches/patch-tests_test_decoder_py
===================================================================
RCS file: patches/patch-tests_test_decoder_py
diff -N patches/patch-tests_test_decoder_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tests_test_decoder_py 28 Apr 2025 13:36:54 -0000
@@ -0,0 +1,58 @@
+Fix tests for version 1.37.0
+/usr/local/bin/bash: line 1: q: command not found
+
+Index: tests/test_decoder.py
+--- tests/test_decoder.py.orig
++++ tests/test_decoder.py
+@@ -20,12 +20,12 @@ import unittest
+
+ from tests.common import (
+ UTF_CODECS,
++ built_in_equivalent_of_test_codec,
+ encoding_detectable,
+ is_test_codec,
+ register_test_codecs,
+ temp_workspace,
+ temp_workspace_with_files_in_many_codecs,
+- test_codec_built_in_equivalent,
+ unregister_test_codecs,
+ uses_bom,
+ )
+@@ -257,23 +257,23 @@ class EncodingStuffFromCommonTestCase(unittest.TestCas
+ self.assertFalse(is_test_codec('utf_8'))
+ self.assertFalse(is_test_codec('utf_8_be'))
+
+- def test_test_codec_built_in_equivalent(self):
++ def test_built_in_equivalent_of_test_codec(self):
+ self.assertEqual(
+ 'utf_32',
+- test_codec_built_in_equivalent('utf_32_be_sig')
++ built_in_equivalent_of_test_codec('utf_32_be_sig')
+ )
+ self.assertEqual(
+ 'utf_32',
+- test_codec_built_in_equivalent('utf_32_le_sig')
++ built_in_equivalent_of_test_codec('utf_32_le_sig')
+ )
+
+ self.assertEqual(
+ 'utf_16',
+- test_codec_built_in_equivalent('utf_16_be_sig')
++ built_in_equivalent_of_test_codec('utf_16_be_sig')
+ )
+ self.assertEqual(
+ 'utf_16',
+- test_codec_built_in_equivalent('utf_16_le_sig')
++ built_in_equivalent_of_test_codec('utf_16_le_sig')
+ )
+
+ def test_uses_bom(self):
+@@ -386,7 +386,7 @@ class DecoderTestCase(unittest.TestCase):
+ elif not encoding_detectable(string, codec):
+ expected_codec = None
+ elif is_test_codec(codec):
+- expected_codec = test_codec_built_in_equivalent(codec)
++ expected_codec = built_in_equivalent_of_test_codec(codec)
+ else:
+ expected_codec = codec
+ self.detect_encoding_test_helper(
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-yamllint/pkg/PLIST,v
diff -u -p -r1.10 PLIST
--- pkg/PLIST 21 Dec 2024 11:40:14 -0000 1.10
+++ pkg/PLIST 28 Apr 2025 13:36:54 -0000
@@ -1,5 +1,5 @@
-@pkgpath devel/py-yamllint,python3
@conflict py-yamllint-<1.23.0p1
+@pkgpath devel/py-yamllint,python3
bin/yamllint
lib/python${MODPY_VERSION}/site-packages/yamllint/
lib/python${MODPY_VERSION}/site-packages/yamllint-${MODPY_DISTV}.dist-info/
@@ -20,6 +20,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}linter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}linter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/yamllint/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -29,6 +31,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/yamllint/conf/default.yaml
lib/python${MODPY_VERSION}/site-packages/yamllint/conf/relaxed.yaml
lib/python${MODPY_VERSION}/site-packages/yamllint/config.py
+lib/python${MODPY_VERSION}/site-packages/yamllint/decoder.py
lib/python${MODPY_VERSION}/site-packages/yamllint/linter.py
lib/python${MODPY_VERSION}/site-packages/yamllint/parser.py
lib/python${MODPY_VERSION}/site-packages/yamllint/rules/
