Skip to content

Commit d482bdc

Browse files
authored
Merge pull request #850 from python-rope/lieryan-update-black
Update and pin black version in pre-commit and Github Actions
2 parents dbc61cb + 2cd9931 commit d482bdc

13 files changed

Lines changed: 32 additions & 33 deletions

File tree

.github/workflows/black.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4
10-
- uses: psf/black@stable
10+
- uses: psf/black@26.5.1

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repos:
88
- id: check-added-large-files
99

1010
- repo: https://github.com/psf/black
11-
rev: 24.1.1
11+
rev: 26.5.1
1212
hooks:
1313
- id: black
1414
name: black check (Python)

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# **Upcoming release**
22

3-
- ...
3+
- #850 Update and pin black version in pre-commit and Github Actions
44

55
# Release 1.14.0
66

docs/default_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def set_prefs(prefs):
108108
# prefs["ignore_bad_imports"] = False
109109

110110
# Controls how rope inserts new import statements. Must be one of:
111-
#
111+
#
112112
# - "normal-import" will insert `import <package>`
113113
# - "from-module" will insert `from <package> import <module>`
114114
# - "from-global" insert insert `from <package>.<module> import <object>`

rope/base/ast.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
try:
88
# Suppress the mypy complaint: Module "ast" has no attribute "_const_node_type_names"
9-
from ast import _const_node_type_names # type:ignore
9+
from ast import _const_node_type_names # type: ignore
1010
except ImportError:
1111
# backported from stdlib `ast`
1212
assert sys.version_info < (3, 8) or sys.version_info >= (3, 14)

rope/base/fscommands.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def read(self, path):
6565
class SubversionCommands:
6666
def __init__(self, *args):
6767
self.normal_actions = FileSystemCommands()
68-
import pysvn # type:ignore
68+
import pysvn # type: ignore
6969

7070
self.client = pysvn.Client()
7171

@@ -115,9 +115,9 @@ def __init__(self, root):
115115
self.repo = self.hg.hg.repository(self.ui, root)
116116

117117
def _import_mercurial(self):
118-
import mercurial.commands # type:ignore
119-
import mercurial.hg # type:ignore
120-
import mercurial.ui # type:ignore
118+
import mercurial.commands # type: ignore
119+
import mercurial.hg # type: ignore
120+
import mercurial.ui # type: ignore
121121

122122
return mercurial
123123

rope/base/oi/doa.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import hmac
55

66
try:
7-
import cPickle as pickle # type:ignore
7+
import cPickle as pickle # type: ignore
88
except ImportError:
9-
import pickle # type:ignore
9+
import pickle # type: ignore
1010
import marshal
1111
import os
1212
import socket

rope/base/oi/runmod.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ def __rope_start_everything():
44
import sys
55

66
try:
7-
import cPickle as pickle # type:ignore
7+
import cPickle as pickle # type: ignore
88
except ImportError:
99
import pickle
1010
import base64

rope/base/oi/type_hinting/evaluate.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class S(SymbolBase):
6969
s.lbp = max(bp, s.lbp)
7070
return s
7171

72-
@multi # type:ignore
72+
@multi # type: ignore
7373
def infix(self, name, bp):
7474
symbol = self.symbol(name, bp)
7575

@@ -79,7 +79,7 @@ def led(self, left, parser):
7979
self.second = parser.expression(bp)
8080
return self
8181

82-
@multi # type:ignore
82+
@multi # type: ignore
8383
def infix_r(self, name, bp):
8484
symbol = self.symbol(name, bp)
8585

@@ -101,16 +101,16 @@ def led(self, left, parser):
101101
self.third = parser.expression(symbol2.lbp + 0.1)
102102
return self
103103

104-
@multi # type:ignore
105-
def prefix(self, name, bp): # type:ignore
104+
@multi # type: ignore
105+
def prefix(self, name, bp): # type: ignore
106106
symbol = self.symbol(name, bp)
107107

108108
@method(symbol)
109109
def nud(self, parser):
110110
self.first = parser.expression(bp)
111111
return self
112112

113-
@multi # type:ignore
113+
@multi # type: ignore
114114
def postfix(self, name, bp):
115115
symbol = self.symbol(name, bp)
116116

@@ -237,18 +237,18 @@ def bind(fn):
237237
symbol("(end)")
238238

239239

240-
@method(symbol("(name)")) # type:ignore
240+
@method(symbol("(name)")) # type: ignore
241241
def nud(self, parser):
242242
return self
243243

244244

245-
@method(symbol("(name)")) # type:ignore
245+
@method(symbol("(name)")) # type: ignore
246246
def evaluate(self, pyobject):
247247
return utils.resolve_type(self.value, pyobject)
248248

249249

250250
# Parametrized objects
251-
@method(symbol("[")) # type:ignore
251+
@method(symbol("[")) # type: ignore
252252
def led(self, left, parser):
253253
self.first = left
254254
self.second = []
@@ -264,15 +264,15 @@ def led(self, left, parser):
264264
return self
265265

266266

267-
@method(symbol("[")) # type:ignore
267+
@method(symbol("[")) # type: ignore
268268
def evaluate(self, pyobject):
269269
return utils.parametrize_type(
270270
self.first.evaluate(pyobject), *[i.evaluate(pyobject) for i in self.second]
271271
)
272272

273273

274274
# Anonymous Function Calls
275-
@method(symbol("(")) # type:ignore
275+
@method(symbol("(")) # type: ignore
276276
def nud(self, parser):
277277
self.second = []
278278
if parser.token.name != ")":
@@ -288,7 +288,7 @@ def nud(self, parser):
288288

289289

290290
# Function Calls
291-
@method(symbol("(")) # type:ignore
291+
@method(symbol("(")) # type: ignore
292292
def led(self, left, parser):
293293
self.first = left
294294
self.second = []
@@ -304,13 +304,13 @@ def led(self, left, parser):
304304
return self
305305

306306

307-
@method(symbol("(")) # type:ignore
307+
@method(symbol("(")) # type: ignore
308308
def evaluate(self, pyobject):
309309
# TODO: Implement me
310310
raise NotImplementedError
311311

312312

313-
@method(symbol("or")) # type:ignore
313+
@method(symbol("or")) # type: ignore
314314
@method(symbol("|"))
315315
def evaluate(self, pyobject):
316316
# TODO: Implement me

rope/base/oi/type_hinting/providers/numpydocstrings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from rope.base.oi.type_hinting.providers import docstrings
1111

1212
try:
13-
from numpydoc.docscrape import NumpyDocString # type:ignore
13+
from numpydoc.docscrape import NumpyDocString # type: ignore
1414
except ImportError:
1515
NumpyDocString = None
1616

@@ -41,4 +41,4 @@ def __call__(self, docstring, param_name):
4141

4242

4343
if not NumpyDocString:
44-
NumPyDocstringParamParser = _DummyParamParser # type:ignore
44+
NumPyDocstringParamParser = _DummyParamParser # type: ignore

0 commit comments

Comments
 (0)