From 797c8f2d8279d61416f677557b58b4af368bf0c6 Mon Sep 17 00:00:00 2001 From: carlio Date: Mon, 26 Nov 2018 10:26:12 +0100 Subject: [PATCH 1/5] Pinning pylint version as current release/master is not compatible with pylint 2.2.0 yet --- .gitignore | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fa9b0156..967e4e3c 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,6 @@ docs/_build # emacs TAGS flycheck* + +# local configuration +.env diff --git a/setup.py b/setup.py index 75baea85..eaa2ece8 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ if sys.version_info < (3, 0): _INSTALL_REQUIRES += ['pylint<2', 'pylint-django<0.9'] else: - _INSTALL_REQUIRES += ['pylint>=2', 'pylint-django==2.0.2'] + _INSTALL_REQUIRES += ['pylint==2.1.1', 'pylint-django==2.0.2'] _PACKAGE_DATA = { 'prospector': [ From 7a8bdc79227d29e40535d35b9e0b3fcd88a32745 Mon Sep 17 00:00:00 2001 From: carlio Date: Mon, 26 Nov 2018 10:30:11 +0100 Subject: [PATCH 2/5] Adding next version information --- .env | 2 ++ CHANGELOG.md | 5 ++++- prospector/__pkginfo__.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 00000000..ea0e7cb9 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +pyenv activate prospector-versions + diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c897e32..e8b4a194 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ Prospector Changelog ======= -## Version 1.1.6 (placeholder for release) +## Version 1.1.6.2 (placeholder for release) +- [#304](https://github.com/PyCQA/prospector/pull/304) Pin pylint to 2.1.1 for now as prospector is not compatible with 2.2.0 + +## Version 1.1.6.1 - [#292](https://github.com/PyCQA/prospector/issues/292) Adding pylint plugin dependencies back and fixing autodetect behaviour. # Version 1.1.5 diff --git a/prospector/__pkginfo__.py b/prospector/__pkginfo__.py index ebaa6945..34a7c911 100644 --- a/prospector/__pkginfo__.py +++ b/prospector/__pkginfo__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version_info__ = (1, 1, 6, 1) +__version_info__ = (1, 1, 6, 2) __version__ = '.'.join(map(str, __version_info__)) From 126b9a93e1634ef9f72be847e1d4df665cd147a1 Mon Sep 17 00:00:00 2001 From: carlio Date: Mon, 26 Nov 2018 10:31:12 +0100 Subject: [PATCH 3/5] Removing accidental .env file checkin --- .env | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index ea0e7cb9..00000000 --- a/.env +++ /dev/null @@ -1,2 +0,0 @@ -pyenv activate prospector-versions - From 709b4813ef7a93dd35e70347c39eb05e1f36959e Mon Sep 17 00:00:00 2001 From: carlio Date: Mon, 26 Nov 2018 10:48:23 +0100 Subject: [PATCH 4/5] [refs #302] Pin astroid to 2.0.4 as some dependencies do not work with latest astroid release --- CHANGELOG.md | 3 ++- setup.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e8b4a194..ce0b26dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ Prospector Changelog ## Version 1.1.6.2 (placeholder for release) - [#304](https://github.com/PyCQA/prospector/pull/304) Pin pylint to 2.1.1 for now as prospector is not compatible with 2.2.0 - +- [#302](https://github.com/PyCQA/prospector/issues/302) Pin astroid to 2.0.4 as pylint-django and pylint-flask need fixes to be compatible with newer versions + ## Version 1.1.6.1 - [#292](https://github.com/PyCQA/prospector/issues/292) Adding pylint plugin dependencies back and fixing autodetect behaviour. diff --git a/setup.py b/setup.py index eaa2ece8..8375c924 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ if sys.version_info < (3, 0): _INSTALL_REQUIRES += ['pylint<2', 'pylint-django<0.9'] else: - _INSTALL_REQUIRES += ['pylint==2.1.1', 'pylint-django==2.0.2'] + _INSTALL_REQUIRES += ['pylint==2.1.1', 'pylint-django==2.0.2', 'astroid==2.0.4'] _PACKAGE_DATA = { 'prospector': [ From 966ab2d9abcdc78bc20a37e3e87b8f44916c4f96 Mon Sep 17 00:00:00 2001 From: carlio Date: Mon, 26 Nov 2018 11:13:37 +0100 Subject: [PATCH 5/5] Removing placeholder from changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce0b26dd..8f367c4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Prospector Changelog ======= -## Version 1.1.6.2 (placeholder for release) +## Version 1.1.6.2 - [#304](https://github.com/PyCQA/prospector/pull/304) Pin pylint to 2.1.1 for now as prospector is not compatible with 2.2.0 - [#302](https://github.com/PyCQA/prospector/issues/302) Pin astroid to 2.0.4 as pylint-django and pylint-flask need fixes to be compatible with newer versions