chore: revert

.github/workflows/test.yml

@@ -30,14 +30,8 @@ jobs:
       - uses: pdm-project/setup-pdm@main
         with:
           python-version: ${{ matrix.python }}
-          enable-pep582: true
       - run: pdm install --dev --no-self --no-default
       - run: pdm run tox -e salt${{ matrix.salt }} -- -vv
-      - if: ${{ matrix.python != '3.6' }}
-        run:
-          pdm venv create
-          pdm venv activate
-          pylint salt_tower test
 
   black:
     runs-on: ubuntu-20.04
@@ -46,6 +40,5 @@ jobs:
       - uses: pdm-project/setup-pdm@main
         with:
           python-version: "3.10"
-          enable-pep582: true
       - run: pdm install --dev --no-self --no-default
       - run: pdm run black --check .

.pylintrc

@@ -3,6 +3,10 @@
 [BASIC]
 good-names=log,f,k,v
 
+[MESSAGES CONTROL]
+# Handled by black
+disable=bad-continuation
+
 [VARIABLES]
 # List of additional names supposed to be defined in builtins. Remember that
 # you should avoid to define new builtins when possible.

pyproject.toml

@@ -24,12 +24,12 @@ pillar_dirs = "salt_tower.loader:pillar_dirs"
 render_dirs = "salt_tower.loader:renderers_dirs"
 
 [project.optional-dependencies]
-test = ["pytest~=7.0.0"]
+test = ["pylint==2.13.8", "pytest~=7.0.0"]
 docs = [
     "mike~=1.0.0; python_version > '3.8'",
     "mkdocs-awesome-pages-plugin~=2.5.0; python_version > '3.8'",
     "mkdocs-git-revision-date-plugin~=0.3.1; python_version > '3.8'",
-    'mkdocs-material~=8.2.13; python_version >= "3.8"',
+    'mkdocs-material==8.2.13; python_version >= "3.8"',
     "setuptools",                                                     # required by mike
 ]
 
@@ -43,10 +43,11 @@ target_version = ["py36", "py37", "py38"]
 [tool.pdm.dev-dependencies]
 dev = [
     "black~=22.3.0; python_version > '3.8'",
-    "pylint~=2.15.0; python_version > '3.7.2'",
+    "mypy~=0.950",
+    "pylint==2.13.8",
     "pytest~=7.0.0",
     "tox~=3.23.0",
-    "jinja2<3.0",                               # not support by salt
+    "jinja2<3.0",                            # not support by salt
 ]
 
 [tool.pytest.ini_options]

salt_tower/pillar/tower.py

@@ -119,7 +119,7 @@ def update(self, obj, merge=True, **kwargs):
             return self.merge(self, obj, **kwargs)
         return super().update(obj)
 
-    def merge(self, *args, **kwargs):
+    def merge(self, *args, **kwargs):  # pylint: disable=no-self-use
         return _merge(*args, **kwargs)
 
     def format(self, obj, *args, **kwargs):

tox.ini

@@ -41,7 +41,9 @@ extras =
     test
 commands_pre =
     salt --versions-report
+    pylint --version
 commands =
     pytest {posargs}
+    pylint salt_tower test
 setenv =
     USE_PACKAGE = {env:USE_PACKAGE:yes}