From a903849526ad98e202561cb23eb1b52479a826a3 Mon Sep 17 00:00:00 2001 From: Matthew Hodgins Date: Mon, 16 Dec 2019 17:17:33 -0600 Subject: [PATCH 1/4] Fix for https://github.com/kmmbvnr/django-jenkins/issues/374 coverage changed their CoverageData.data member to _data, exposed via get_data() --- django_jenkins/tasks/with_coverage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_jenkins/tasks/with_coverage.py b/django_jenkins/tasks/with_coverage.py index 0fdae8a3..1a798094 100644 --- a/django_jenkins/tasks/with_coverage.py +++ b/django_jenkins/tasks/with_coverage.py @@ -52,7 +52,7 @@ def get_morfs(self, coverage, tested_locations, options): # Exclude by directory excluded.extend(getattr(settings, 'COVERAGE_EXCLUDES_FOLDERS', [])) - return [filename for filename in coverage.data.measured_files() + return [filename for filename in coverage.get_data().measured_files() if not (os.sep + 'migrations' + os.sep) in filename if not (os.sep + 'south_migrations' + os.sep) in filename if any(filename.startswith(location) for location in tested_locations) From ac9eb7c516a7106d0d8eb7598abaab7d460213ac Mon Sep 17 00:00:00 2001 From: Matthew Hodgins Date: Thu, 2 Jul 2020 10:17:06 -0500 Subject: [PATCH 2/4] Fix for #378 Pylint changed the arguments to Run() --- .gitignore | 1 + django_jenkins/tasks/run_pylint.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 914cc114..a8729025 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ geckodriver.log +.DS_Store diff --git a/django_jenkins/tasks/run_pylint.py b/django_jenkins/tasks/run_pylint.py index 0a2e74c0..c2fa57c7 100644 --- a/django_jenkins/tasks/run_pylint.py +++ b/django_jenkins/tasks/run_pylint.py @@ -41,7 +41,7 @@ def run(self, apps_locations, **options): args += ['--errors-only'] args += apps_locations - lint.Run(args, reporter=ParseableTextReporter(output=output), exit=False) + lint.Run(args, reporter=ParseableTextReporter(output=output), do_exit=False) output.close() From 45f7b15157c456489d0ba7ee2cdbe40a03adcc1f Mon Sep 17 00:00:00 2001 From: Matthew Hodgins Date: Thu, 2 Jul 2020 10:20:46 -0500 Subject: [PATCH 3/4] Revert "Fix for #378" This reverts commit ac9eb7c516a7106d0d8eb7598abaab7d460213ac. --- .gitignore | 1 - django_jenkins/tasks/run_pylint.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a8729025..914cc114 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,3 @@ geckodriver.log -.DS_Store diff --git a/django_jenkins/tasks/run_pylint.py b/django_jenkins/tasks/run_pylint.py index c2fa57c7..0a2e74c0 100644 --- a/django_jenkins/tasks/run_pylint.py +++ b/django_jenkins/tasks/run_pylint.py @@ -41,7 +41,7 @@ def run(self, apps_locations, **options): args += ['--errors-only'] args += apps_locations - lint.Run(args, reporter=ParseableTextReporter(output=output), do_exit=False) + lint.Run(args, reporter=ParseableTextReporter(output=output), exit=False) output.close() From 39315bb9bbbfb7035b070e6d81b59bae5ff0c4c7 Mon Sep 17 00:00:00 2001 From: Matthew Hodgins Date: Thu, 2 Jul 2020 10:22:36 -0500 Subject: [PATCH 4/4] Fix for #378 Pylint changed the arguments to the Run() method. --- django_jenkins/tasks/run_pylint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django_jenkins/tasks/run_pylint.py b/django_jenkins/tasks/run_pylint.py index 0a2e74c0..c2fa57c7 100644 --- a/django_jenkins/tasks/run_pylint.py +++ b/django_jenkins/tasks/run_pylint.py @@ -41,7 +41,7 @@ def run(self, apps_locations, **options): args += ['--errors-only'] args += apps_locations - lint.Run(args, reporter=ParseableTextReporter(output=output), exit=False) + lint.Run(args, reporter=ParseableTextReporter(output=output), do_exit=False) output.close()