From 52266726b3d3503da5a129de53cdb1779917f606 Mon Sep 17 00:00:00 2001 From: Robert Raposa <rraposa@edx.org> Date: Sat, 18 May 2019 21:59:57 -0400 Subject: [PATCH] remove ungrouped-imports rule from pylint --- pylintrc | 26 ++++++++++++++++++-------- requirements/edx/development.txt | 2 +- requirements/edx/testing.in | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/pylintrc b/pylintrc index 1b2a44c341f..92660094a46 100644 --- a/pylintrc +++ b/pylintrc @@ -26,17 +26,28 @@ # 1. Edit the pylintrc file in the edx-lint repo at # https://github.com/edx/edx-lint/blob/master/edx_lint/files/pylintrc # -# 2. Make a new version of edx_lint, which involves the usual steps of -# incrementing the version number, submitting and reviewing a pull -# request, and updating the edx-lint version reference in this repo. +# 2. install the updated version of edx-lint (in edx-lint): # -# 3. Install the newer version of edx-lint. +# $ pip install . # -# 4. Run: +# 3. Run (in edx-lint): # +# # uses pylintrc_tweaks from edx-lint for linting in edx-lint +# # NOTE: Use Python 3.x, which no longer includes comments in the output file # $ edx_lint write pylintrc # -# 5. This will modify the local file. Submit a pull request to get it +# 4. Make a new version of edx_lint, submit and review a pull request with the +# pylintrc update, and after merging, update the edx-lint version by +# creating a new tag in the repo (uses pbr). +# +# 5. In your local repo, install the newer version of edx-lint. +# +# 6. Run: +# +# # uses local pylintrc_tweaks +# $ edx_lint write pylintrc +# +# 7. This will modify the local file. Submit a pull request to get it # checked in so that others will benefit. # # @@ -252,7 +263,6 @@ enable = too-many-boolean-expressions, # Consistent import order makes finding where code is # imported from easier - ungrouped-imports, wrong-import-order, wrong-import-position, wildcard-import, @@ -446,4 +456,4 @@ int-import-graph = [EXCEPTIONS] overgeneral-exceptions = Exception -# e841c53729c149a4170b2a8b8315f7f410287777 +# 69925c09262a3e603e0b833ddc773d2d0c267899 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 3ad13a65006..00d1d74b923 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -134,7 +134,7 @@ edx-django-utils==1.0.3 edx-drf-extensions==2.2.1 edx-enterprise==1.5.2 edx-i18n-tools==0.4.8 -edx-lint==1.1.2 +edx-lint==1.2.0 edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 diff --git a/requirements/edx/testing.in b/requirements/edx/testing.in index e2999327429..52d531da8ee 100644 --- a/requirements/edx/testing.in +++ b/requirements/edx/testing.in @@ -25,7 +25,7 @@ code-annotations # Perform code annotation checking, such as for PII an cssselect # Used to extract HTML fragments via CSS selectors in 2 test cases and pyquery ddt # Run a test case multiple times with different input; used in many, many of our tests edx-i18n-tools>=0.4.6 # Commands for developers and translators to extract, compile and validate translations -edx-lint==1.1.2 # pylint extensions for Open edX repositories +edx-lint==1.2.0 # pylint extensions for Open edX repositories factory_boy==2.8.1 # Library for creating test fixtures, used in many tests freezegun # Allows tests to mock the output of assorted datetime module functions httpretty # Library for mocking HTTP requests, used in many tests diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index e4bfeb08315..31b5880697f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -130,7 +130,7 @@ edx-django-utils==1.0.3 edx-drf-extensions==2.2.1 edx-enterprise==1.5.2 edx-i18n-tools==0.4.8 -edx-lint==1.1.2 +edx-lint==1.2.0 edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 -- GitLab