Skip to content

Commit 0f641b1

Browse files
klenklen
committed
Merge branch 'feature/pylama' into develop
2 parents 4c426b9 + a004206 commit 0f641b1

File tree

1,115 files changed

+91438
-24715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,115 files changed

+91438
-24715
lines changed

‎Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ pylama:
5050
rm -rf $(PYLAMA)
5151
make $(PYLAMA)
5252
make $(PYLAMA)/lint/pylama_pylint
53+
@pip install --upgrade --force-reinstall --target=$(LIBS) pydocstyle
54+
@pip install --upgrade --force-reinstall --target=$(LIBS) pycodestyle
55+
@pip install --upgrade --force-reinstall --target=$(LIBS) pyflakes
56+
@pip install --upgrade --force-reinstall --target=$(LIBS) mccabe
57+
@find $(LIBS)/*.dist-info | xargs rm -rf
5358

5459
.PHONY: rope
5560
rope:

‎pylama.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[pylama]
2+
ignore=D213
23
linters=pep8,pyflakes,pylint
34

45
[pylama:pymode/libs*]

‎pymode/libs/_markerlib/__init__.py

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎pymode/libs/_markerlib/markers.py

Lines changed: 0 additions & 119 deletions
This file was deleted.

‎pymode/libs/astroid/__init__.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@
5858

5959
# more stuff available
6060
from astroid import raw_building
61-
from astroid.bases import YES, Instance, BoundMethod, UnboundMethod
61+
from astroid.bases import Instance, BoundMethod, UnboundMethod
6262
from astroid.node_classes import are_exclusive, unpack_infer
6363
from astroid.scoped_nodes import builtin_lookup
64+
from astroid.builder import parse
65+
from astroid.util import YES
6466

6567
# make a manager instance (borg) as well as Project and Package classes
6668
# accessible from astroid package
67-
from astroid.manager import AstroidManager, Project
69+
from astroid.manager import AstroidManager
6870
MANAGER = AstroidManager()
6971
del AstroidManager
7072

@@ -100,7 +102,7 @@ def inference_tip(infer_function):
100102
101103
.. sourcecode:: python
102104
103-
MANAGER.register_transform(CallFunc, inference_tip(infer_named_tuple),
105+
MANAGER.register_transform(Call, inference_tip(infer_named_tuple),
104106
predicate)
105107
"""
106108
def transform(node, infer_function=infer_function):
@@ -112,8 +114,11 @@ def transform(node, infer_function=infer_function):
112114
def register_module_extender(manager, module_name, get_extension_mod):
113115
def transform(node):
114116
extension_module = get_extension_mod()
115-
for name, obj in extension_module.locals.items():
116-
node.locals[name] = obj
117+
for name, objs in extension_module._locals.items():
118+
node._locals[name] = objs
119+
for obj in objs:
120+
if obj.parent is extension_module:
121+
obj.parent = node
117122

118123
manager.register_transform(Module, transform, lambda n: n.name == module_name)
119124

‎pymode/libs/astroid/__pkginfo__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020

2121
modname = 'astroid'
2222

23-
numversion = (1, 3, 8)
23+
numversion = (1, 4, 9)
2424
version = '.'.join([str(num) for num in numversion])
2525

26-
install_requires = ['logilab-common>=0.63.0', 'six']
26+
install_requires = ['six', 'lazy_object_proxy', 'wrapt']
2727

2828
license = 'LGPL'
2929

30-
author = 'Logilab'
31-
author_email = 'pylint-dev@lists.logilab.org'
30+
author = 'Python Code Quality Authority'
31+
author_email = 'code-quality@python.org'
3232
mailinglist = "mailto://%s" % author_email
33-
web = 'http://bitbucket.org/logilab/astroid'
33+
web = 'https://github.com/PyCQA/astroid'
3434

3535
description = "A abstract syntax tree for Python with inference support."
3636

0 commit comments

Comments
 (0)