python/python-blue
SHA256
15
0
Fork 0
forked from pool/python-blue
Code Pull Requests Activity

- drop unpin-black.patch (obsolete)

Browse Source 
- update flake8-v5-compatibility.patch to unpin flake8 again

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-blue?expand=0&rev=20
This commit is contained in:
Dirk Mueller
2023-01-28 13:08:17 +00:00
committed by Git OBS Bridge
parent 5bdf488cda
commit 3881642047
4 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flake8-v5-compatibility.patch
View File

@@ -15,3 +15,14 @@
class MergedConfigParser(BaseConfigParser):
--- blue-0.9.1.orig/setup.py
+++ blue-0.9.1/setup.py
@@ -37,7 +37,7 @@ setup(
packages=['blue'],
tests_require=['tox'],
cmdclass={'test': Tox},
- install_requires=['black==22.1.0', 'flake8>=3.8,<5.0.0'],
+ install_requires=['black==22.1.0', 'flake8>=3.8'],
project_urls={
'Documentation': 'https://blue.readthedocs.io/en/latest',
'Source': 'https://github.com/grantjenks/blue.git',

2
python-blue.changes
View File

@@ -7,6 +7,8 @@ Sat Jan 28 12:58:30 UTC 2023 - Dirk Müller <dmueller@suse.com>
* Add support for testing against Python 3.10 and 3.11 in tox.ini, and fix an
incompatibility with the rstcheck command line.
* Bump copyright years.
- drop unpin-black.patch (obsolete)
- update flake8-v5-compatibility.patch to unpin flake8 again
-------------------------------------------------------------------
Mon Sep 19 10:14:39 UTC 2022 - Daniel Garcia <daniel.garcia@suse.com>

2
python-blue.spec
View File

@@ -25,8 +25,6 @@ Summary: A code formatter written in, and written for Python
License: MIT
URL: https://github.com/grantjenks/blue
Source: https://github.com/grantjenks/blue/archive/v%{version}.tar.gz#/blue-%{version}.tar.gz
# PATCH-FIX-OPENSUSE unpin-black.patch -- we can't have a fixed black version in the distribution
Patch0: unpin-black.patch
# PATCH-FIX-OPENSUSE unpin-tomli.patch -- gh#grantjenks/blue#66
Patch1: unpin-tomli.patch
# PATCH-FIX-UPSTREAM flake8-v5-compatibility.patch -- gh#grantjenks/blue#78

30
unpin-black.patch
View File

@@ -1,30 +0,0 @@
---
blue/__init__.py | 5 +++--
setup.py | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
--- a/blue/__init__.py
+++ b/blue/__init__.py
@@ -448,8 +448,9 @@ def main():
'Black', 'Blue'
)
# Change the config param callback to support setup.cfg, tox.ini, etc.
- config_param = black.main.params[25]
- assert config_param.name == 'config'
+ # the index changed somewhere between black 21.7b and 21.12b
+ cfgidx = {p.name: i for (i, p) in enumerate(black.main.params)}['config']
+ config_param = black.main.params[cfgidx]
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
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ setup(
packages=['blue'],
tests_require=['tox'],
cmdclass={'test': Tox},
- install_requires=['black==22.1.0', 'flake8>=3.8'],
+ install_requires=['black>=22.1.0', 'flake8>=3.8'],
project_urls={
'Documentation': 'https://blue.readthedocs.io/en/latest',
'Source': 'https://github.com/grantjenks/blue.git',