Skip to content

Commit

Permalink
Merge branch 'master' into issue/1148
Browse files Browse the repository at this point in the history
  • Loading branch information
x539 authored and Andreas Freimuth committed Mar 16, 2018
2 parents a694419 + 03aa4ca commit 36c700f
Show file tree
Hide file tree
Showing 217 changed files with 4,508 additions and 1,046 deletions.
61 changes: 61 additions & 0 deletions .copyrite_aliases
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
[
{
"mails": [
"cpopa@cloudbasesolutions.com",
"pcmanticore@gmail.com"
],
"authoritative_mail": "pcmanticore@gmail.com",
"name": "Claudiu Popa"
},
{
"mails": [
"alexandre.fayolle@logilab.fr",
"emile.anclin@logilab.fr",
"david.douard@logilab.fr",
"laura.medioni@logilab.fr",
"anthony.truchet@logilab.fr",
"alain.leufroy@logilab.fr",
"julien.cristau@logilab.fr",
"Adrien.DiMascio@logilab.fr",
"emile@crater.logilab.fr",
"sylvain.thenault@logilab.fr",
"pierre-yves.david@logilab.fr",
"nicolas.chauvat@logilab.fr",
"afayolle.ml@free.fr",
"aurelien.campeas@logilab.fr",
"lmedioni@logilab.fr"

],
"authoritative_mail": "contact@logilab.fr",
"name": "LOGILAB S.A. (Paris, FRANCE)"
},
{
"mails": [
"moylop260@vauxoo.com"
],
"name": "Moises Lopez",
"authoritative_mail": "moylop260@vauxoo.com"
},
{
"mails": [
"nathaniel@google.com",
"mbp@google.com",
"tmarek@google.com",
"shlomme@gmail.com",
"balparda@google.com",
"dlindquist@google.com"
],
"name": "Google, Inc."
},
{
"mails": [
"ashley@awhetter.co.uk",
"awhetter.2011@my.bristol.ac.uk",
"asw@dneg.com",
"AWhetter@users.noreply.github.com"
],
"name": "Ashley Whetter",
"authoritative_mail": "ashley@awhetter.co.uk"
}

]
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ debian/pylint.substvars
debian/pylint
.coverage
.coverage.*
.idea
12 changes: 2 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,13 @@ language: python
# 3.5-dev because of http://bugs.python.org/issue25131
matrix:
include:
- python: 2.7
env: TOXENV=py27
- python: 2.7.6
env: TOXENV=py27
# This is used by Ubuntu Trusty
- python: 3.3
env: TOXENV=py33
- python: 3.4
env: TOXENV=py34
- python: 3.5-dev
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: pypy
- python: pypy3.5-5.8.0
env: TOXENV=pypy
- python: 3.5
env: TOXENV=pylint
Expand All @@ -27,6 +20,7 @@ before_install:
- sudo apt-get -qq update
- sudo apt-get install -y enchant
install:
- pip install -U setuptools
- pip install tox coverage coveralls
- virtualenv --version
- easy_install --version
Expand All @@ -36,8 +30,6 @@ install:
script:
# Test install with current version of setuptools
- pip install .
# Run the tests with newest version of setuptools
- pip install -U setuptools
- tox -e coverage-erase,$TOXENV
after_success:
- tox -e coveralls
Expand Down
44 changes: 34 additions & 10 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ Order doesn't matter (not that much, at least ;)

* Sylvain Thenault (Logilab): main author / maintainer

* Torsten Marek (Google): maintainer, contributor
* Torsten Marek (Google): comitter / contributor

* Claudiu Popa: maintainer, contributor

* Cara Vinson, astroid committer.

* Dmitry Pribysh: committer

multiple-imports, not-iterable, not-a-mapping, various patches.

* Ashley Whetter: committer

check_docs extension can find constructor parameters in __init__,
added check_raise_docs extension, various patches.

* Cara Vinson, astroid committer.

* Guillaume Peillex: committer

* Łukasz Rogalski: comitter.

* Roy Williams (Lyft): committer

added check for implementing __eq__ without implementing __hash__,
Expand All @@ -30,6 +30,10 @@ Order doesn't matter (not that much, at least ;)
Added Python 3 check for accessing deprecated methods on the 'string' module,
various patches.

* Dmitry Pribysh: committer

multiple-imports, not-iterable, not-a-mapping, various patches.

* Daniel Balparda (Google): GPyLint maintainer (Google's pylint variant),
various patches

Expand Down Expand Up @@ -101,8 +105,6 @@ Order doesn't matter (not that much, at least ;)

* Mike Frysinger: contributor.

* Łukasz Rogalski: contributor.

* Moisés López (Vauxoo): Support for deprecated-modules in modules not installed,
Refactory wrong-import-order to integrate it with `isort` library
Add check too-complex with mccabe for cyclomatic complexity
Expand All @@ -124,7 +126,8 @@ Order doesn't matter (not that much, at least ;)
* Alexander Todorov: added new error conditions to 'bad-super-call',
Added new check for incorrect len(SEQUENCE) usage,
Added new extension for comparison against empty string constants,
Added new extension which detects comparing integers to zero
Added new extension which detects comparing integers to zero,
Added new useless-return checker

* Erik Eriksson - Added overlapping-except error check.

Expand All @@ -137,3 +140,24 @@ Order doesn't matter (not that much, at least ;)
* John Paraskevopoulos: add 'differing-param-doc' and 'differing-type-doc'

* Martin von Gagern (Google): Added 'raising-format-tuple' warning.

* Ahirnish Pareek, 'keyword-arg-before-var-arg' check

* Daniel Miller: contributor.

* Bryce Guinta: contributor

* Martin Bašti: contributor
Added new check for shallow copy of os.environ

* Jacques Kvam: contributor

* Brian Shaginaw: prevent error on exception check for functions

* Ioana Tagirta: fix bad thread instantiation check

* Reverb Chu: contributor

* Tobias Hernstig: contributor

* Konstantin Manna: contributor

0 comments on commit 36c700f

Please sign in to comment.