[geany/www.geany.org] da27c8: Minor PyLint and isort fixes

Enrico Tröger git-noreply at xxxxx
Sun Aug 9 09:01:29 UTC 2020


Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sun, 09 Aug 2020 09:01:29 UTC
Commit:      da27c80657861687b142950044fcb0e1854817ec
             https://github.com/geany/www.geany.org/commit/da27c80657861687b142950044fcb0e1854817ec

Log Message:
-----------
Minor PyLint and isort fixes

And temporarily stick to isort 4.x until PyLint has isort 5.x support.


Modified Paths:
--------------
    geany/settings.py
    tox.ini

Modified: geany/settings.py
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -428,7 +428,7 @@
     (_("Geany"), (
         "latest_version.LatestVersion",
     )),
-    (_("Users"), ("auth.User", "auth.Group",)))
+    (_("Users"), ("auth.User", "auth.Group",)))  # pylint: disable=hard-coded-auth-user
 
 # django-debug-toolbar
 DEBUG_TOOLBAR_PATCH_SETTINGS = False
@@ -623,8 +623,8 @@ def skip_404_not_found(record):
 local_settings_file_name = os.environ.get('LOCAL_SETTINGS_PY', 'local_settings.py')
 filename = os.path.join(PROJECT_APP_PATH, local_settings_file_name)  # pylint: disable=invalid-name
 if os.path.exists(filename):
-    import sys
     from importlib.util import module_from_spec, spec_from_file_location
+    import sys
     module_name = '{}.local_settings'.format(PROJECT_APP)  # pylint: disable=invalid-name
     spec = spec_from_file_location(module_name, filename)  # pylint: disable=invalid-name
     module = module_from_spec(spec)  # pylint: disable=invalid-name


Modified: tox.ini
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -22,7 +22,7 @@ geany_modules = geany latest_version news nightlybuilds pastebin static_docs
 [testenv]
 deps =
     flake8
-    isort
+    isort<5  # temporarily stick to isort 4.x: https://github.com/PyCQA/pylint/pull/3725
     pylint
     pylint-django
     -r{toxinidir}/requirements.txt



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list