More build fixes (#205)

Author: ssbarnea

.github/workflows/tox.yml

@@ -95,10 +95,10 @@ jobs:
         run: python3 -m pip install --upgrade 'tox>=4.0.3'
 
       - name: Initialize tox envs
-        run: python -m tox --notest --skip-missing-interpreters false -vv -e tox_env
+        run: python -m tox --notest --skip-missing-interpreters false -vv -e ${{ matrix.tox_env }}
 
       - name: Test with tox
-        run: python -m tox -e tox_env
+        run: python -m tox -e ${{ matrix.tox_env }}
 
       - name: Archive logs
         uses: actions/upload-artifact@v3

.pre-commit-config.yaml

@@ -84,7 +84,6 @@ repos:
         args: ["--strict"]
         additional_dependencies:
           - cached_property
-          - flaky
           - packaging
           - pytest
           - pytest-mock
@@ -98,7 +97,6 @@ repos:
       - id: pylint
         additional_dependencies:
           - PyYAML
-          - flaky
           - pytest
           - typing_extensions
   # Keep last due to being considerably slower than the others:
@@ -109,17 +107,17 @@ repos:
         name: Upgrade constraints files and requirements
         files: ^(pyproject\.toml|requirements\.txt)$
         language: python
-        entry: python -m piptools compile --upgrade -q --extra docs --extra test --output-file=requirements.txt pyproject.toml
+        entry: python -m piptools compile --resolver=backtracking --upgrade -q --extra docs --extra test --output-file=requirements.txt pyproject.toml
         pass_filenames: false
         stages:
           - manual
         additional_dependencies:
-          - pip-tools>=6.10.0
+          - pip-tools>=6.11.0
       - id: pip-compile
         name: Check constraints files and requirements
         files: ^(pyproject\.toml|requirements\.txt)$
         language: python
-        entry: python -m piptools compile -q --extra docs --extra test --output-file=requirements.txt pyproject.toml
+        entry: python -m piptools compile --resolver=backtracking -q --extra docs --extra test --output-file=requirements.txt pyproject.toml
         pass_filenames: false
         additional_dependencies:
-          - pip-tools>=6.10.0
+          - pip-tools>=6.11.0

.pylintrc

@@ -56,14 +56,7 @@ docs = [
   "sphinx_ansible_theme",
   "myst_parser",
 ]
-test = [
-  "coverage",
-  "flaky",
-  "pip-tools",
-  "pytest>=7.2.0",
-  "pytest-mock",
-  "pytest-plus",
-]
+test = ["coverage", "pip-tools", "pytest>=7.2.0", "pytest-mock", "pytest-plus"]
 
 [tool.coverage.run]
 source = ["src"]
@@ -73,11 +66,48 @@ branch = true
 exclude_lines = ["pragma: no cover", "if TYPE_CHECKING:"]
 skip_covered = true
 
+[tool.mypy]
+python_version = 3.8
+color_output = true
+error_summary = true
+disallow_untyped_calls = true
+disallow_untyped_defs = true
+disallow_any_generics = true
+# disallow_any_unimported = True
+#; warn_redundant_casts = True
+# warn_return_any = True
+# warn_unused_configs = True
+exclude = "test/local-content"
+
 [tool.isort]
 profile = "black"
 
+[tool.pylint.BASIC]
+good-names = [
+  "f", # filename
+  "i",
+  "j",
+  "k",
+  "ns", # namespace
+  "ex",
+  "Run",
+  "_"
+]
+
+[tool.pylint.IMPORTS]
+preferred-modules = ["unittest:pytest"]
+
+[tool.pylint."MESSAGES CONTROL"]
+disable = [
+  # On purpose disabled as we rely on black
+  "line-too-long",
+  # local imports do not work well with pre-commit hook
+  "import-error",
+  # Temporary disable duplicate detection we remove old code from prerun
+  "duplicate-code",
+]
+
 [tool.pytest.ini_options]
-addopts = "--no-success-flaky-report"
 # ensure we treat warnings as error
 filterwarnings = ["error"]
 

mypy.ini

@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
-#    pip-compile --extra=docs --extra=test --output-file=requirements.txt pyproject.toml
+#    pip-compile --extra=docs --extra=test --output-file=requirements.txt --resolver=backtracking pyproject.toml
 #
 alabaster==0.7.12
     # via sphinx
@@ -33,8 +33,6 @@ docutils==0.17.1
     #   sphinx-rtd-theme
 exceptiongroup==1.0.4
     # via pytest
-flaky==3.7.0
-    # via ansible-compat (pyproject.toml)
 idna==3.4
     # via requests
 imagesize==1.4.1

pyproject.toml

@@ -10,7 +10,6 @@
 
 import pytest
 from _pytest.monkeypatch import MonkeyPatch
-from flaky import flaky
 from packaging.version import Version
 from pytest_mock import MockerFixture
 
@@ -213,8 +212,6 @@ def remember_cwd(cwd: str) -> Iterator[None]:
         os.chdir(curdir)
 
 
-# # https://github.com/box/flaky/issues/170
-@flaky(max_runs=3)  # type: ignore
 def test_prerun_reqs_v1(caplog: pytest.LogCaptureFixture, runtime: Runtime) -> None:
     """Checks that the linter can auto-install requirements v1 when found."""
     cwd = os.path.realpath(
@@ -234,7 +231,6 @@ def test_prerun_reqs_v1(caplog: pytest.LogCaptureFixture, runtime: Runtime) -> N
     )
 
 
-@flaky(max_runs=3)  # type: ignore
 def test_prerun_reqs_v2(caplog: pytest.LogCaptureFixture, runtime: Runtime) -> None:
     """Checks that the linter can auto-install requirements v2 when found."""
     cwd = os.path.realpath(

requirements.txt

@@ -79,7 +79,8 @@ deps =
 skip_install = true
 usedevelop = false
 commands =
-  {envpython} -m pre_commit run -a --show-diff-on-failure {posargs:}
+  pre-commit run -a --show-diff-on-failure {posargs:}
+  pre-commit run -a pip-compile
 passenv =
   {[testenv]passenv}
   PRE_COMMIT_HOME