diff --git a/blue-0.6.0.tar.gz b/blue-0.6.0.tar.gz deleted file mode 100644 index b734bfb..0000000 --- a/blue-0.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd8d0566d08cf0f01dab9f894a84cc36c32409516874c661bec0d4bd7c140df1 -size 84598 diff --git a/blue-0.7.0.tar.gz b/blue-0.7.0.tar.gz new file mode 100644 index 0000000..d8941af --- /dev/null +++ b/blue-0.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f64ae7a338c5da11f51a9d53f25f78a650f51a9d41e258f930b7eafd8a92613 +size 86381 diff --git a/python-blue.changes b/python-blue.changes index a057c31..6b4ff96 100644 --- a/python-blue.changes +++ b/python-blue.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jan 12 07:25:55 UTC 2022 - Steve Kowalik + +- Update to 0.7.0: + * Upgrade dependency on black to 21.7b0 +- Add patch support-new-flake8.patch: + * Support backwards incompatiable changes with flake8 4.0 + ------------------------------------------------------------------- Wed Mar 17 04:05:48 UTC 2021 - Steve Kowalik diff --git a/python-blue.spec b/python-blue.spec index dedb284..8ace926 100644 --- a/python-blue.spec +++ b/python-blue.spec @@ -1,7 +1,7 @@ # # spec file for package python-blue # -# Copyright (c) 2021 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 @@ -20,15 +20,16 @@ %define skip_python2 1 %define modname blue Name: python-blue -Version: 0.6.0 +Version: 0.7.0 Release: 0 Summary: A code formatter written in, and written for Python License: MIT URL: https://github.com/grantjenks/blue Source: https://github.com/grantjenks/%{modname}/archive/v%{version}.tar.gz#/%{modname}-%{version}.tar.gz +Patch0: support-new-flake8.patch BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module base >= 3.6} -BuildRequires: %{python_module black} +BuildRequires: %{python_module black >= 21.7} # BuildRequires: %%{python_module doc8} BuildRequires: %{python_module flake8} BuildRequires: %{python_module pytest-cov} @@ -45,7 +46,7 @@ Requires: python-aiohttp >= 3.3.2 Requires: python-aiohttp_cors Requires: python-appdirs Requires: python-attrs >= 18.1.0 -Requires: python-black +Requires: python-black >= 21.7 Requires: python-click >= 7.1.2 Requires: python-flake8 Requires: python-mypy_extensions >= 0.4.3 @@ -81,7 +82,7 @@ Provides: %{python_module foo-doc = %{version}} HTML Documentation and examples for %name. %prep -%setup -q -n blue-%{version} +%autosetup -p1 -n blue-%{version} %build %python_build diff --git a/support-new-flake8.patch b/support-new-flake8.patch new file mode 100644 index 0000000..9f541dc --- /dev/null +++ b/support-new-flake8.patch @@ -0,0 +1,21 @@ +Index: blue-0.7.0/blue/__init__.py +=================================================================== +--- blue-0.7.0.orig/blue/__init__.py ++++ blue-0.7.0/blue/__init__.py +@@ -332,7 +332,7 @@ def format_file_in_place(*args, **kws): + return black_format_file_in_place(*args, **kws) + + +-class MergedConfigParser(flake8_config.MergedConfigParser): ++class MergedConfigParser(flake8_config.ConfigParser): + def _parse_config(self, config_parser, parent=None): + """Skip option parsing in flake8's config parsing.""" + config_dict = {} +@@ -382,7 +382,6 @@ def main(): + ) + # Change the config param callback to support setup.cfg, tox.ini, etc. + config_param = black.main.params[21] +- assert config_param.name == 'config' + config_param.callback = read_configs + # Change the version string by adding a redundant Click `version_option` + # decorator on `black.main`. Fortunately the added `version_option` takes