Fri Apr 21 09:26:30 2023 UTC ()
py-yapf: updated to 0.33.0

0.33.0
Added
- Add a new Python parser to generate logical lines.
- Added support for `# fmt: on` and `# fmt: off` pragmas.
Changes
- Moved 'pytree' parsing tools into its own subdirectory.
- Add support for Python 3.10.
- Format generated dicts with respect to same rules as regular dicts
- Generalized the ending comma heuristic to subscripts.
- Supports "pyproject.toml" by default.
Fixed
- Split line before all comparison operators.


(adam)
diff -r1.6 -r1.7 pkgsrc/devel/py-yapf/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/py-yapf/PLIST
diff -r1.5 -r1.6 pkgsrc/devel/py-yapf/distinfo
cvs diff -r1.6 -r1.7 pkgsrc/devel/py-yapf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-yapf/Makefile 2022/01/05 15:41:09 1.6
+++ pkgsrc/devel/py-yapf/Makefile 2023/04/21 09:26:30 1.7
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1# $NetBSD: Makefile,v 1.6 2022/01/05 15:41:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2023/04/21 09:26:30 adam Exp $
2 2
3DISTNAME= yapf-0.32.0 3DISTNAME= yapf-0.33.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5PKGREVISION= 2 
6CATEGORIES= devel textproc python 5CATEGORIES= devel textproc python
7MASTER_SITES= ${MASTER_SITE_PYPI:=y/yapf/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=y/yapf/}
8 7
9MAINTAINER= nils@NetBSD.org 8MAINTAINER= nils@NetBSD.org
10HOMEPAGE= https://github.com/google/yapf 9HOMEPAGE= https://github.com/google/yapf
11COMMENT= Python files formatter 10COMMENT= Python files formatter
12LICENSE= apache-2.0 11LICENSE= apache-2.0
13 12
 13DEPENDS+= ${PYPKGPREFIX}-tomli>=2.0.1:../../textproc/py-tomli
 14
14USE_LANGUAGES= # none 15USE_LANGUAGES= # none
15 16
16USE_PKG_RESOURCES= yes 17USE_PKG_RESOURCES= yes
17 18
18post-install: 19post-install:
19.for bin in yapf yapf-diff 20.for bin in yapf yapf-diff
20 cd ${DESTDIR}${PREFIX}/bin && \ 21 cd ${DESTDIR}${PREFIX}/bin && \
21 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE} 22 ${MV} ${bin} ${bin}-${PYVERSSUFFIX} || ${TRUE}
22.endfor 23.endfor
23 24
24.include "../../lang/python/egg.mk" 25.include "../../lang/python/egg.mk"
25.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/devel/py-yapf/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/py-yapf/PLIST 2021/12/31 12:21:55 1.5
+++ pkgsrc/devel/py-yapf/PLIST 2023/04/21 09:26:30 1.6
@@ -1,48 +1,79 @@ @@ -1,48 +1,79 @@
1@comment $NetBSD: PLIST,v 1.5 2021/12/31 12:21:55 adam Exp $ 1@comment $NetBSD: PLIST,v 1.6 2023/04/21 09:26:30 adam Exp $
2bin/yapf-${PYVERSSUFFIX} 2bin/yapf-${PYVERSSUFFIX}
3bin/yapf-diff-${PYVERSSUFFIX} 3bin/yapf-diff-${PYVERSSUFFIX}
4${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 4${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
5${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 5${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
6${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 6${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
7${PYSITELIB}/${EGG_INFODIR}/entry_points.txt 7${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 8${PYSITELIB}/${EGG_INFODIR}/requires.txt
8${PYSITELIB}/${EGG_INFODIR}/top_level.txt 9${PYSITELIB}/${EGG_INFODIR}/top_level.txt
9${PYSITELIB}/yapf/__init__.py 10${PYSITELIB}/yapf/__init__.py
10${PYSITELIB}/yapf/__init__.pyc 11${PYSITELIB}/yapf/__init__.pyc
11${PYSITELIB}/yapf/__init__.pyo 12${PYSITELIB}/yapf/__init__.pyo
12${PYSITELIB}/yapf/__main__.py 13${PYSITELIB}/yapf/__main__.py
13${PYSITELIB}/yapf/__main__.pyc 14${PYSITELIB}/yapf/__main__.pyc
14${PYSITELIB}/yapf/__main__.pyo 15${PYSITELIB}/yapf/__main__.pyo
 16${PYSITELIB}/yapf/pyparser/__init__.py
 17${PYSITELIB}/yapf/pyparser/__init__.pyc
 18${PYSITELIB}/yapf/pyparser/__init__.pyo
 19${PYSITELIB}/yapf/pyparser/pyparser.py
 20${PYSITELIB}/yapf/pyparser/pyparser.pyc
 21${PYSITELIB}/yapf/pyparser/pyparser.pyo
 22${PYSITELIB}/yapf/pyparser/pyparser_utils.py
 23${PYSITELIB}/yapf/pyparser/pyparser_utils.pyc
 24${PYSITELIB}/yapf/pyparser/pyparser_utils.pyo
 25${PYSITELIB}/yapf/pyparser/split_penalty_visitor.py
 26${PYSITELIB}/yapf/pyparser/split_penalty_visitor.pyc
 27${PYSITELIB}/yapf/pyparser/split_penalty_visitor.pyo
 28${PYSITELIB}/yapf/pytree/__init__.py
 29${PYSITELIB}/yapf/pytree/__init__.pyc
 30${PYSITELIB}/yapf/pytree/__init__.pyo
 31${PYSITELIB}/yapf/pytree/blank_line_calculator.py
 32${PYSITELIB}/yapf/pytree/blank_line_calculator.pyc
 33${PYSITELIB}/yapf/pytree/blank_line_calculator.pyo
 34${PYSITELIB}/yapf/pytree/comment_splicer.py
 35${PYSITELIB}/yapf/pytree/comment_splicer.pyc
 36${PYSITELIB}/yapf/pytree/comment_splicer.pyo
 37${PYSITELIB}/yapf/pytree/continuation_splicer.py
 38${PYSITELIB}/yapf/pytree/continuation_splicer.pyc
 39${PYSITELIB}/yapf/pytree/continuation_splicer.pyo
 40${PYSITELIB}/yapf/pytree/pytree_unwrapper.py
 41${PYSITELIB}/yapf/pytree/pytree_unwrapper.pyc
 42${PYSITELIB}/yapf/pytree/pytree_unwrapper.pyo
 43${PYSITELIB}/yapf/pytree/pytree_utils.py
 44${PYSITELIB}/yapf/pytree/pytree_utils.pyc
 45${PYSITELIB}/yapf/pytree/pytree_utils.pyo
 46${PYSITELIB}/yapf/pytree/pytree_visitor.py
 47${PYSITELIB}/yapf/pytree/pytree_visitor.pyc
 48${PYSITELIB}/yapf/pytree/pytree_visitor.pyo
 49${PYSITELIB}/yapf/pytree/split_penalty.py
 50${PYSITELIB}/yapf/pytree/split_penalty.pyc
 51${PYSITELIB}/yapf/pytree/split_penalty.pyo
 52${PYSITELIB}/yapf/pytree/subtype_assigner.py
 53${PYSITELIB}/yapf/pytree/subtype_assigner.pyc
 54${PYSITELIB}/yapf/pytree/subtype_assigner.pyo
15${PYSITELIB}/yapf/third_party/__init__.py 55${PYSITELIB}/yapf/third_party/__init__.py
16${PYSITELIB}/yapf/third_party/__init__.pyc 56${PYSITELIB}/yapf/third_party/__init__.pyc
17${PYSITELIB}/yapf/third_party/__init__.pyo 57${PYSITELIB}/yapf/third_party/__init__.pyo
18${PYSITELIB}/yapf/third_party/yapf_diff/__init__.py 58${PYSITELIB}/yapf/third_party/yapf_diff/__init__.py
19${PYSITELIB}/yapf/third_party/yapf_diff/__init__.pyc 59${PYSITELIB}/yapf/third_party/yapf_diff/__init__.pyc
20${PYSITELIB}/yapf/third_party/yapf_diff/__init__.pyo 60${PYSITELIB}/yapf/third_party/yapf_diff/__init__.pyo
21${PYSITELIB}/yapf/third_party/yapf_diff/yapf_diff.py 61${PYSITELIB}/yapf/third_party/yapf_diff/yapf_diff.py
22${PYSITELIB}/yapf/third_party/yapf_diff/yapf_diff.pyc 62${PYSITELIB}/yapf/third_party/yapf_diff/yapf_diff.pyc
23${PYSITELIB}/yapf/third_party/yapf_diff/yapf_diff.pyo 63${PYSITELIB}/yapf/third_party/yapf_diff/yapf_diff.pyo
24${PYSITELIB}/yapf/yapflib/__init__.py 64${PYSITELIB}/yapf/yapflib/__init__.py
25${PYSITELIB}/yapf/yapflib/__init__.pyc 65${PYSITELIB}/yapf/yapflib/__init__.pyc
26${PYSITELIB}/yapf/yapflib/__init__.pyo 66${PYSITELIB}/yapf/yapflib/__init__.pyo
27${PYSITELIB}/yapf/yapflib/blank_line_calculator.py 
28${PYSITELIB}/yapf/yapflib/blank_line_calculator.pyc 
29${PYSITELIB}/yapf/yapflib/blank_line_calculator.pyo 
30${PYSITELIB}/yapf/yapflib/comment_splicer.py 
31${PYSITELIB}/yapf/yapflib/comment_splicer.pyc 
32${PYSITELIB}/yapf/yapflib/comment_splicer.pyo 
33${PYSITELIB}/yapf/yapflib/continuation_splicer.py 
34${PYSITELIB}/yapf/yapflib/continuation_splicer.pyc 
35${PYSITELIB}/yapf/yapflib/continuation_splicer.pyo 
36${PYSITELIB}/yapf/yapflib/errors.py 67${PYSITELIB}/yapf/yapflib/errors.py
37${PYSITELIB}/yapf/yapflib/errors.pyc 68${PYSITELIB}/yapf/yapflib/errors.pyc
38${PYSITELIB}/yapf/yapflib/errors.pyo 69${PYSITELIB}/yapf/yapflib/errors.pyo
39${PYSITELIB}/yapf/yapflib/file_resources.py 70${PYSITELIB}/yapf/yapflib/file_resources.py
40${PYSITELIB}/yapf/yapflib/file_resources.pyc 71${PYSITELIB}/yapf/yapflib/file_resources.pyc
41${PYSITELIB}/yapf/yapflib/file_resources.pyo 72${PYSITELIB}/yapf/yapflib/file_resources.pyo
42${PYSITELIB}/yapf/yapflib/format_decision_state.py 73${PYSITELIB}/yapf/yapflib/format_decision_state.py
43${PYSITELIB}/yapf/yapflib/format_decision_state.pyc 74${PYSITELIB}/yapf/yapflib/format_decision_state.pyc
44${PYSITELIB}/yapf/yapflib/format_decision_state.pyo 75${PYSITELIB}/yapf/yapflib/format_decision_state.pyo
45${PYSITELIB}/yapf/yapflib/format_token.py 76${PYSITELIB}/yapf/yapflib/format_token.py
46${PYSITELIB}/yapf/yapflib/format_token.pyc 77${PYSITELIB}/yapf/yapflib/format_token.pyc
47${PYSITELIB}/yapf/yapflib/format_token.pyo 78${PYSITELIB}/yapf/yapflib/format_token.pyo
48${PYSITELIB}/yapf/yapflib/identify_container.py 79${PYSITELIB}/yapf/yapflib/identify_container.py
@@ -50,47 +81,35 @@ ${PYSITELIB}/yapf/yapflib/identify_conta @@ -50,47 +81,35 @@ ${PYSITELIB}/yapf/yapflib/identify_conta
50${PYSITELIB}/yapf/yapflib/identify_container.pyo 81${PYSITELIB}/yapf/yapflib/identify_container.pyo
51${PYSITELIB}/yapf/yapflib/line_joiner.py 82${PYSITELIB}/yapf/yapflib/line_joiner.py
52${PYSITELIB}/yapf/yapflib/line_joiner.pyc 83${PYSITELIB}/yapf/yapflib/line_joiner.pyc
53${PYSITELIB}/yapf/yapflib/line_joiner.pyo 84${PYSITELIB}/yapf/yapflib/line_joiner.pyo
54${PYSITELIB}/yapf/yapflib/logical_line.py 85${PYSITELIB}/yapf/yapflib/logical_line.py
55${PYSITELIB}/yapf/yapflib/logical_line.pyc 86${PYSITELIB}/yapf/yapflib/logical_line.pyc
56${PYSITELIB}/yapf/yapflib/logical_line.pyo 87${PYSITELIB}/yapf/yapflib/logical_line.pyo
57${PYSITELIB}/yapf/yapflib/object_state.py 88${PYSITELIB}/yapf/yapflib/object_state.py
58${PYSITELIB}/yapf/yapflib/object_state.pyc 89${PYSITELIB}/yapf/yapflib/object_state.pyc
59${PYSITELIB}/yapf/yapflib/object_state.pyo 90${PYSITELIB}/yapf/yapflib/object_state.pyo
60${PYSITELIB}/yapf/yapflib/py3compat.py 91${PYSITELIB}/yapf/yapflib/py3compat.py
61${PYSITELIB}/yapf/yapflib/py3compat.pyc 92${PYSITELIB}/yapf/yapflib/py3compat.pyc
62${PYSITELIB}/yapf/yapflib/py3compat.pyo 93${PYSITELIB}/yapf/yapflib/py3compat.pyo
63${PYSITELIB}/yapf/yapflib/pytree_unwrapper.py 
64${PYSITELIB}/yapf/yapflib/pytree_unwrapper.pyc 
65${PYSITELIB}/yapf/yapflib/pytree_unwrapper.pyo 
66${PYSITELIB}/yapf/yapflib/pytree_utils.py 
67${PYSITELIB}/yapf/yapflib/pytree_utils.pyc 
68${PYSITELIB}/yapf/yapflib/pytree_utils.pyo 
69${PYSITELIB}/yapf/yapflib/pytree_visitor.py 
70${PYSITELIB}/yapf/yapflib/pytree_visitor.pyc 
71${PYSITELIB}/yapf/yapflib/pytree_visitor.pyo 
72${PYSITELIB}/yapf/yapflib/reformatter.py 94${PYSITELIB}/yapf/yapflib/reformatter.py
73${PYSITELIB}/yapf/yapflib/reformatter.pyc 95${PYSITELIB}/yapf/yapflib/reformatter.pyc
74${PYSITELIB}/yapf/yapflib/reformatter.pyo 96${PYSITELIB}/yapf/yapflib/reformatter.pyo
75${PYSITELIB}/yapf/yapflib/split_penalty.py 97${PYSITELIB}/yapf/yapflib/split_penalty.py
76${PYSITELIB}/yapf/yapflib/split_penalty.pyc 98${PYSITELIB}/yapf/yapflib/split_penalty.pyc
77${PYSITELIB}/yapf/yapflib/split_penalty.pyo 99${PYSITELIB}/yapf/yapflib/split_penalty.pyo
78${PYSITELIB}/yapf/yapflib/style.py 100${PYSITELIB}/yapf/yapflib/style.py
79${PYSITELIB}/yapf/yapflib/style.pyc 101${PYSITELIB}/yapf/yapflib/style.pyc
80${PYSITELIB}/yapf/yapflib/style.pyo 102${PYSITELIB}/yapf/yapflib/style.pyo
81${PYSITELIB}/yapf/yapflib/subtype_assigner.py 
82${PYSITELIB}/yapf/yapflib/subtype_assigner.pyc 
83${PYSITELIB}/yapf/yapflib/subtype_assigner.pyo 
84${PYSITELIB}/yapf/yapflib/subtypes.py 103${PYSITELIB}/yapf/yapflib/subtypes.py
85${PYSITELIB}/yapf/yapflib/subtypes.pyc 104${PYSITELIB}/yapf/yapflib/subtypes.pyc
86${PYSITELIB}/yapf/yapflib/subtypes.pyo 105${PYSITELIB}/yapf/yapflib/subtypes.pyo
87${PYSITELIB}/yapf/yapflib/verifier.py 106${PYSITELIB}/yapf/yapflib/verifier.py
88${PYSITELIB}/yapf/yapflib/verifier.pyc 107${PYSITELIB}/yapf/yapflib/verifier.pyc
89${PYSITELIB}/yapf/yapflib/verifier.pyo 108${PYSITELIB}/yapf/yapflib/verifier.pyo
90${PYSITELIB}/yapf/yapflib/yapf_api.py 109${PYSITELIB}/yapf/yapflib/yapf_api.py
91${PYSITELIB}/yapf/yapflib/yapf_api.pyc 110${PYSITELIB}/yapf/yapflib/yapf_api.pyc
92${PYSITELIB}/yapf/yapflib/yapf_api.pyo 111${PYSITELIB}/yapf/yapflib/yapf_api.pyo
93${PYSITELIB}/yapftests/__init__.py 112${PYSITELIB}/yapftests/__init__.py
94${PYSITELIB}/yapftests/__init__.pyc 113${PYSITELIB}/yapftests/__init__.pyc
95${PYSITELIB}/yapftests/__init__.pyo 114${PYSITELIB}/yapftests/__init__.pyo
96${PYSITELIB}/yapftests/blank_line_calculator_test.py 115${PYSITELIB}/yapftests/blank_line_calculator_test.py
cvs diff -r1.5 -r1.6 pkgsrc/devel/py-yapf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-yapf/distinfo 2021/12/31 12:21:55 1.5
+++ pkgsrc/devel/py-yapf/distinfo 2023/04/21 09:26:30 1.6
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.5 2021/12/31 12:21:55 adam Exp $ 1$NetBSD: distinfo,v 1.6 2023/04/21 09:26:30 adam Exp $
2 2
3BLAKE2s (yapf-0.32.0.tar.gz) = 39c624e12ee5d3c7fcf236183635bb7639a1c72359825a4e1b5db68192b65e94 3BLAKE2s (yapf-0.33.0.tar.gz) = 4bb7e2371b729b7e4c8d6e3a45a65f77be71bb8a6ba8bed502964920d4652431
4SHA512 (yapf-0.32.0.tar.gz) = e9f295e6f5d626203796e0b6d798ce206f0944c20984f818490e12dcde5b75ad2ce79917b0990432c07a8b4948f51482f9467396328737016b32b4aa6d340013 4SHA512 (yapf-0.33.0.tar.gz) = 9cbb89e35580db0506fd4b8b1f7c0f35d5671a889f7344dc8c58b153b6b4568a267fd43abf142e6a2917a8e70dda0f0f8ba8980a0f7221b09fe28ca6383a0862
5Size (yapf-0.32.0.tar.gz) = 194820 bytes 5Size (yapf-0.33.0.tar.gz) = 203773 bytes