From 4483c08ff4798153f38c7e4d9f2ea91f7685d12a75ec88afd0092ddde7340ca9 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 12 Jan 2022 03:16:26 +0000 Subject: [PATCH 1/2] - Update to 21.12.0b1: * Fix determination of f-string expression spans (#2654) * Fix bad formatting of error messages about EOF in multi-line statements (#2343) * Functions and classes in blocks now have more consistent surrounding spacing (#2472) * from __future__ import annotations statement now implies Python 3.7+ (#2690) * Fix assignment to environment variables in Jupyter Notebooks (#2642) * Point users to using --target-version py310 if we detect 3.10-only syntax (#2668) * Fix match statements with open sequence subjects, like match a, b: or match a, *b: (#2639) (#2659) * Fix match/case statements that contain match/case soft keywords multiple times, like match re.match() (#2661) * Fix case statements with an inline body (#2665) * Fix styling of starred expressions inside match subject (#2667) * Fix parser error location on invalid syntax in a match statement (#2649) * Fix Python 3.10 support on platforms without ProcessPoolExecutor (#2631) * Improve parsing performance on code that uses match under --target-version py310 up to ~50% (#2670) * Remove dependency on regex (#2644) (#2663) * Warn about Python 2 deprecation in more cases by improving Python 2 only syntax detection (#2592) * Add experimental PyPy support (#2559) * Add partial support for the match statement. As it's experimental, it's only enabled when --target-version py310 is explicitly specified (#2586) * Add support for parenthesized with (#2586) * Declare support for Python 3.10 for running Black (#2562) * Add new --workers parameter (#2514) * Fixed feature detection for positional-only arguments in lambdas (#2532) * Fixed a Python 3.10 compatibility issue where the loop argument was still being passed even though it has been removed (#2580) * Deprecate Python 2 formatting support (#2523) * Fix missing modules in self-contained binaries (#2466) * Fix missing toml extra used during installation (#2475) * Add support for formatting Jupyter Notebook files (#2357) * Move from appdirs dependency to platformdirs (#2375) * Present a more user-friendly error if .gitignore is invalid (#2414) * Pin setuptools-scm build-time dependency version (#2457) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-black?expand=0&rev=25 --- black-20.8b1.tar.gz | 3 -- black-21.12b0.tar.gz | 3 ++ python-black.changes | 75 ++++++++++++++++++++++++++++++++++++++++++++ python-black.spec | 28 +++++++---------- 4 files changed, 90 insertions(+), 19 deletions(-) delete mode 100644 black-20.8b1.tar.gz create mode 100644 black-21.12b0.tar.gz diff --git a/black-20.8b1.tar.gz b/black-20.8b1.tar.gz deleted file mode 100644 index 5a9ed3c..0000000 --- a/black-20.8b1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c02557aa099101b9d21496f8a914e9ed2222ef70336404eeeac8edba836fbea -size 1096433 diff --git a/black-21.12b0.tar.gz b/black-21.12b0.tar.gz new file mode 100644 index 0000000..6a6833d --- /dev/null +++ b/black-21.12b0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77b80f693a569e2e527958459634f18df9b0ba2625ba4e0c2d5da5be42e6f2b3 +size 594232 diff --git a/python-black.changes b/python-black.changes index fc0be1e..e61ce43 100644 --- a/python-black.changes +++ b/python-black.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Wed Jan 12 03:09:25 UTC 2022 - Steve Kowalik + +- Update to 21.12.0b1: + * Fix determination of f-string expression spans (#2654) + * Fix bad formatting of error messages about EOF in multi-line statements (#2343) + * Functions and classes in blocks now have more consistent surrounding spacing (#2472) + * from __future__ import annotations statement now implies Python 3.7+ (#2690) + * Fix assignment to environment variables in Jupyter Notebooks (#2642) + * Point users to using --target-version py310 if we detect 3.10-only syntax (#2668) + * Fix match statements with open sequence subjects, like match a, b: or match a, *b: (#2639) (#2659) + * Fix match/case statements that contain match/case soft keywords multiple times, like match re.match() (#2661) + * Fix case statements with an inline body (#2665) + * Fix styling of starred expressions inside match subject (#2667) + * Fix parser error location on invalid syntax in a match statement (#2649) + * Fix Python 3.10 support on platforms without ProcessPoolExecutor (#2631) + * Improve parsing performance on code that uses match under --target-version py310 up to ~50% (#2670) + * Remove dependency on regex (#2644) (#2663) + * Warn about Python 2 deprecation in more cases by improving Python 2 only syntax detection (#2592) + * Add experimental PyPy support (#2559) + * Add partial support for the match statement. As it's experimental, it's only enabled when --target-version py310 is explicitly specified (#2586) + * Add support for parenthesized with (#2586) + * Declare support for Python 3.10 for running Black (#2562) + * Add new --workers parameter (#2514) + * Fixed feature detection for positional-only arguments in lambdas (#2532) + * Fixed a Python 3.10 compatibility issue where the loop argument was still being passed even though it has been removed (#2580) + * Deprecate Python 2 formatting support (#2523) + * Fix missing modules in self-contained binaries (#2466) + * Fix missing toml extra used during installation (#2475) + * Add support for formatting Jupyter Notebook files (#2357) + * Move from appdirs dependency to platformdirs (#2375) + * Present a more user-friendly error if .gitignore is invalid (#2414) + * Pin setuptools-scm build-time dependency version (#2457) + * Configuration files using TOML features higher than spec v0.5.0 are now supported (#2301) + * Accept empty stdin (#2346) + * Provide a more useful error when parsing fails during AST safety checks (#2304) + * Fix failure caused by fmt: skip and indentation (#2281) + * Account for += assignment when deciding whether to split string (#2312) + * Correct max string length calculation when there are string operators (#2292) + * Fixed option usage when using the --code flag (#2259) + * Do not call uvloop.install() when Black is used as a library (#2303) + * Added --required-version option to require a specific version to be running (#2300) + * Fix incorrect custom breakpoint indices when string group contains fake f-strings (#2311) + * Fix regression where R prefixes would be lowercased for docstrings (#2285) + * Fix handling of named escapes (\N{...}) when --experimental-string-processing is used (#2319) + * Restored compatibility with Click 8.0 on Python 3.6 when LANG=C used (#2227) + * Add extra uvloop install + import support if in python env (#2258) + * Fix --experimental-string-processing crash when matching parens are not found (#2283) + * Make sure to split lines that start with a string operator (#2286) + * Fix regular expression that black uses to identify f-expressions (#2287) + * Blackd + * Add a lower bound for the aiohttp-cors dependency. Only 0.4.0 or higher is supported. (#2231) + * Refactor src/black/__init__.py into many files (#2206) + * Set --pyi mode if --stdin-filename ends in .pyi (#2169) + * Stop detecting target version as Python 3.9+ with pre-PEP-614 decorators that are being called but with no arguments (#2182) + * Fix crash if the user configuration directory is inaccessible. (#2158) + * Clarify circumstances in which Black may change the AST (#2159) + * Fix crash on docstrings ending with "\ ". (#2142) + * Fix crash when atypical whitespace is cleaned out of dostrings (#2120) + * Reflect the --skip-magic-trailing-comma and --experimental-string-processing flags in the name of the cache file. Without this fix, changes in these flags would not take effect if the cache had already been populated. (#2131) + * Fixed a rare but annoying formatting instability created by the combination of optional trailing commas inserted by Black and optional parentheses looking at pre-existing "magic" trailing commas. This fixes issue #1629 and all of its many many duplicates. (#2126) + * Black now cleans up leading non-breaking spaces in comments (#2092) + * Black no longer removes all empty lines between non-function code and decorators when formatting typing stubs. Now Black enforces a single empty line. (#1646) + * Black no longer adds an incorrect space after a parenthesized assignment expression in if/while statements (#1655) + * Added --skip-magic-trailing-comma / -C to avoid using trailing commas as a reason to split lines (#1824) + * fixed a crash when PWD=/ on POSIX (#1631) + * fixed "I/O operation on closed file" when using --diff (#1664) + * Prevent coloured diff output being interleaved with multiple files (#1673) + * Added support for PEP 614 relaxed decorator syntax on python 3.9 (#1711) + * Added parsing support for unparenthesized tuples and yield expressions in annotated assignments (#1835) + * --diff correctly indicates when a file doesn't end in a newline (#1662) + * Added --stdin-filename argument to allow stdin to respect --force-exclude rules (#1780) + * Lines ending with fmt: skip will now be not formatted (#1800) + * PR #2053: Black no longer relies on typed-ast for Python 3.8 and higher + ------------------------------------------------------------------- Sat Dec 5 23:44:07 UTC 2020 - Benjamin Greiner diff --git a/python-black.spec b/python-black.spec index faecea7..3c9c057 100644 --- a/python-black.spec +++ b/python-black.spec @@ -1,7 +1,7 @@ # # spec file for package python-black # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-black -Version: 20.8b1 +Version: 21.12b0 Release: 0 Summary: A code formatter written in, and written for Python License: MIT @@ -27,39 +27,35 @@ URL: https://github.com/psf/black Source: https://files.pythonhosted.org/packages/source/b/black/black-%{version}.tar.gz BuildRequires: %{python_module aiohttp >= 3.3.2} BuildRequires: %{python_module aiohttp_cors} -BuildRequires: %{python_module appdirs} BuildRequires: %{python_module attrs >= 18.1.0} BuildRequires: %{python_module base >= 3.6} BuildRequires: %{python_module click >= 7.1.2} BuildRequires: %{python_module mypy_extensions >= 0.4.3} -BuildRequires: %{python_module pathspec >= 0.6} +BuildRequires: %{python_module pathspec >= 0.9.0} +BuildRequires: %{python_module platformdirs >= 2} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module regex >= 2020.1.8} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module toml >= 0.10.1} -BuildRequires: %{python_module typed-ast >= 1.4.0} +BuildRequires: %{python_module tomli >= 1.1.0} BuildRequires: %{python_module typing_extensions} -BuildRequires: (python36-dataclasses if python36-base) -BuildRequires: (python3-dataclasses if python3-base < 3.7) BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: (python3-dataclasses if python3-base < 3.7) +BuildRequires: (python36-dataclasses if python36-base) Requires: python-aiohttp >= 3.3.2 Requires: python-aiohttp_cors -Requires: python-appdirs Requires: python-attrs >= 18.1.0 Requires: python-click >= 7.1.2 Requires: python-mypy_extensions >= 0.4.3 -Requires: python-pathspec >= 0.6 -Requires: python-regex >= 2020.1.8 -Requires: python-toml >= 0.10.1 -Requires: python-typed-ast >= 1.4.0 +Requires: python-pathspec >= 0.9.0 +Requires: python-platformdirs >= 2 +Requires: python-tomli >= 1.1.0 Requires: python-typing_extensions %if 0%{?python_version_nodots} == 36 Requires: python-dataclasses %endif Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives BuildArch: noarch %python_subpackages @@ -111,7 +107,7 @@ fi %python_uninstall_alternative black %files %{python_files} -%doc README.md CHANGES.md docs/*.md docs/reference +%doc README.md CHANGES.md docs/*.md %license LICENSE %python_alternative %{_bindir}/black %python_alternative %{_bindir}/blackd From 40c9ee755b176304451c98b8baa21ce9b73d032dabd481c7100bf189d24041a8 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 12 Jan 2022 03:44:13 +0000 Subject: [PATCH 2/2] - Skip python 2 tests unconditionally. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-black?expand=0&rev=26 --- python-black.changes | 3 ++- python-black.spec | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/python-black.changes b/python-black.changes index e61ce43..97d427e 100644 --- a/python-black.changes +++ b/python-black.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Wed Jan 12 03:09:25 UTC 2022 - Steve Kowalik +Wed Jan 12 03:39:41 UTC 2022 - Steve Kowalik - Update to 21.12.0b1: * Fix determination of f-string expression spans (#2654) @@ -72,6 +72,7 @@ Wed Jan 12 03:09:25 UTC 2022 - Steve Kowalik * Added --stdin-filename argument to allow stdin to respect --force-exclude rules (#1780) * Lines ending with fmt: skip will now be not formatted (#1800) * PR #2053: Black no longer relies on typed-ast for Python 3.8 and higher +- Skip python 2 tests unconditionally. ------------------------------------------------------------------- Sat Dec 5 23:44:07 UTC 2020 - Benjamin Greiner diff --git a/python-black.spec b/python-black.spec index 3c9c057..60291a7 100644 --- a/python-black.spec +++ b/python-black.spec @@ -93,11 +93,7 @@ cp $(ls %{buildroot}%{_bindir}/black-* | head -1) ~/bin/black export PATH=$PATH:~/bin # test_expression_diff - sometimes fails on async timing in OBS -skiptests="test_expression_diff" -# https://github.com/psf/black/issues/1109 -if [ $(python3 -c 'import sys; print(sys.byteorder)') == 'big' ]; then -skiptests+=" or test_python2" -fi +skiptests="test_expression_diff or py2" %pytest -k "not ($skiptests)" %post