From 7589d46e333b9020d0d52eb4a506b811973825ed Mon Sep 17 00:00:00 2001 From: Piotr Kasprzyk Date: Wed, 11 May 2022 16:49:52 +0200 Subject: [PATCH 1/2] make python and pylint more up-to-date --- .github/workflows/ci.yml | 6 +++--- pylintrc | 12 ++++++------ setup.py | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4289f5b..626ca30 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | pip install -e .[dev] @@ -19,7 +19,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest] #, windows-latest] - python-version: [3.6, 3.7, 3.8] + python-version: [3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: 3.6 + python-version: 3.9 - name: Build and test run : | python setup.py sdist diff --git a/pylintrc b/pylintrc index 850e79e..8f44e60 100644 --- a/pylintrc +++ b/pylintrc @@ -22,7 +22,7 @@ persistent=yes load-plugins=pylintfileheader # File header -file-header=#\n# Copyright \(c\) (2019|2020|2021), Neptune Labs Sp\. z o\.o\.\n#\n# Licensed under the Apache License, Version 2\.0 \(the "License"\);\n# you may not use this file except in compliance with the License\.\n# You may obtain a copy of the License at\n#\n# http://www\.apache\.org/licenses/LICENSE-2\.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an "AS IS" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.\n# See the License for the specific language governing permissions and\n# limitations under the License\.\n#\n +file-header=#\n# Copyright \(c\) (2019|2020|2021|2022), Neptune Labs Sp\. z o\.o\.\n#\n# Licensed under the Apache License, Version 2\.0 \(the "License"\);\n# you may not use this file except in compliance with the License\.\n# You may obtain a copy of the License at\n#\n# http://www\.apache\.org/licenses/LICENSE-2\.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an "AS IS" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.\n# See the License for the specific language governing permissions and\n# limitations under the License\.\n#\n [MESSAGES CONTROL] @@ -42,22 +42,22 @@ file-header=#\n# Copyright \(c\) (2019|2020|2021), Neptune Labs Sp\. z o\.o\.\n# # W0401, W0614 Allow wildcard imports. # W0511 Allow TODO/FIXME comments. # W0703 Allow too broad except clause (Exception). -# W0212(protected-access) Access to a protected member of a client class # W1202 Allow logging-format-interpolation. # I0011 Do not show Locally disabled warnings in report # C0412 Disable checking imports from package %s are not grouped -# disable=R,C0103,C0111,W0401,W0511,W0614,W0703,W1202,I0011,C0412 -disable=R,C0111,W0511,W0212 +# W0707 Consider explicitly re-raising using the 'from' keyword +# C0415 Import outside toplevel +# C0302 Too many lines in module +disable=R,C0103,C0111,W0401,W0511,W0614,W0703,W1202,I0011,C0412,W0707,C0415,C0302 # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option # multiple time. See also the "--disable" option for examples. # R0401 Enable detection of cyclic imports. -# R0801 Enable detection of similar code. # R0921 Enable checking for unused abstract classes. # R0923 Enable checking for unused interfaces. -enable=R0401,R0801,R0921,R0923 +enable=R0401,R0921,R0923 [REPORTS] diff --git a/setup.py b/setup.py index f59c2c8..f067224 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ def main(): all_deps += extras[group_name] extras['all'] = all_deps extras['dev'] = [ - 'pylint==2.4.2', + 'pylint==2.9.6', 'pylintfileheader==0.0.2', 'pytest>=5.0', 'pytest-tap==3.2', From de2cf65e430d42b26f605572c918b1711305cf30 Mon Sep 17 00:00:00 2001 From: Piotr Kasprzyk Date: Thu, 12 May 2022 08:34:41 +0200 Subject: [PATCH 2/2] unpin pylintfileheader --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f067224..f695c93 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ def main(): extras['all'] = all_deps extras['dev'] = [ 'pylint==2.9.6', - 'pylintfileheader==0.0.2', + 'pylintfileheader', 'pytest>=5.0', 'pytest-tap==3.2', 'pytest-cov==2.10.1',