Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions astroid/inference.py
Original file line number Diff line number Diff line change
Expand Up @@ -537,9 +537,9 @@ def _infer_unaryop(self, context=None):
yield operand
else:
yield result
except AttributeInferenceError as exc:
except AttributeInferenceError as inner_exc:
# The unary operation special method was not found.
yield util.BadUnaryOperationMessage(operand, self.op, exc)
yield util.BadUnaryOperationMessage(operand, self.op, inner_exc)
except InferenceError:
yield util.Uninferable

Expand Down
5 changes: 1 addition & 4 deletions astroid/nodes/scoped_nodes/scoped_nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1386,7 +1386,6 @@ def __init__(
frame = parent.frame(future=True)
frame.set_local(name, self)

# pylint: disable=arguments-differ; different than Lambdas
def postinit(
self,
args: Arguments,
Expand Down Expand Up @@ -1490,9 +1489,7 @@ def extra_decorators(self) -> List[node_classes.Call]:
return decorators

@cached_property
def type(
self,
): # pylint: disable=invalid-overridden-method,too-many-return-statements
def type(self): # pylint: disable=too-many-return-statements
"""The function type for this node.

Possible values are: method, function, staticmethod, classmethod.
Expand Down
2 changes: 0 additions & 2 deletions astroid/rebuilder.py
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,6 @@ def visit_attribute(
parent=parent,
)
elif context == Context.Store:
# pylint: disable=redefined-variable-type
newnode = nodes.AssignAttr(
attrname=node.attr,
lineno=node.lineno,
Expand Down Expand Up @@ -1572,7 +1571,6 @@ def visit_name(
parent=parent,
)
elif context == Context.Store:
# pylint: disable=redefined-variable-type
newnode = nodes.AssignName(
name=node.id,
lineno=node.lineno,
Expand Down
1 change: 1 addition & 0 deletions requirements_test.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
-r requirements_test_min.txt
-r requirements_test_pre_commit.txt
contributors-txt>=0.7.4
coveralls~=3.3
coverage~=5.5
pre-commit~=2.17
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_pre_commit.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
black==22.1.0
pylint==2.12.2
pylint~=2.13.0
isort==5.10.1
flake8==4.0.1
flake8-typing-imports==1.12.0
Expand Down
5 changes: 0 additions & 5 deletions tbump.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ src = "astroid/__pkginfo__.py"
name = "Upgrade changelog changelog"
cmd = "python3 script/bump_changelog.py {new_version}"

[[before_commit]]
# We only need this during tbump, it's not compatible with python < 3.7
name = "Install dependencie for contributors.txt's update."
cmd = "pip install 'contributors-txt>=0.7.3'"

[[before_commit]]
name = "Normalize the contributors-txt configuration"
cmd = "contributors-txt-normalize-configuration -a script/.contributors_aliases.json -o script/.contributors_aliases.json"
Expand Down