commit c6050ac3893a3633e541ee0e408411b37dfea4c4 Author: Moshe Levi Date: Mon Oct 5 09:35:07 2020 +0300 Bump pylint version to support python 3.8 Change-Id: Ieddf59a559340cab6e314e0d31da67fdf2661fa1 diff --git a/networking_mlnx/journal/journal.py b/networking_mlnx/journal/journal.py index 4d62246..345d14c 100644 --- a/networking_mlnx/journal/journal.py +++ b/networking_mlnx/journal/journal.py @@ -203,19 +203,18 @@ class SdnJournalThread(object): db.update_db_row_state( session, row, sdn_const.COMPLETED) continue - elif job_status in ("Pending", "Running"): + if job_status in ("Pending", "Running"): LOG.debug("NEO Job id %(job_id)s is %(status)s " "continue monitoring", {'job_id': row.job_id, 'status': job_status}) continue - else: - LOG.error("NEO Job id %(job_id)s, failed with" - " %(status)s", - {'job_id': row.job_id, - 'status': job_status}) - db.update_db_row_state( - session, row, sdn_const.PENDING) + LOG.error("NEO Job id %(job_id)s, failed with" + " %(status)s", + {'job_id': row.job_id, + 'status': job_status}) + db.update_db_row_state( + session, row, sdn_const.PENDING) except (ValueError, AttributeError): LOG.error("failed to extract response for job" "id %s", row.job_id) diff --git a/test-requirements.txt b/test-requirements.txt index 47fc6f3..ae7ca3a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,6 @@ bandit!=1.6.0,>=1.1.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD flake8-import-order==0.12 # LGPLv3 -flake8==3.6.0 python-subunit>=1.0.0 # Apache-2.0/BSD testtools>=2.2.0 # MIT testresources>=2.0.0 # Apache-2.0/BSD @@ -14,10 +13,8 @@ testscenarios>=0.4 # Apache-2.0/BSD WebTest>=2.0.27 # MIT reno>=3.1.0 # Apache-2.0 ddt>=1.0.1 # MIT -astroid==1.6.5;python_version<"3.0" # LGPLv2.1 -astroid==2.1.0;python_version>="3.0" # LGPLv2.1 -pylint==1.9.2;python_version<"3.0" # GPLv2 -pylint==2.2.0;python_version>="3.0" # GPLv2 +astroid==2.3.3 # LGPLv2.1 +pylint==2.4.4 # GPLv2 isort==4.3.21 # MIT # Needed to run DB commands in virtualenvs bashate>=0.5.1 # Apache-2.0