Merge 5b2355a into 8cc5bf7

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.24.0
+current_version = 0.24.1
 commit = False
 tag = False
 

docs/ideas/ini.toml

@@ -48,7 +48,7 @@ inline-quotes = "{{ nit.present(str, choices=['double', 'single']) }}"
 skip__separators = ","
 known_first_party__separators = ","
 
-["setup.cfg"."tool:pytest"]
+["tox.ini".pytest]
 # https://github.com/andreoliwa/nitpick/issues/271
 addopts__separators = " "
 norecursedirs__separators = " "

package.json

@@ -18,7 +18,7 @@
       [
         "@semantic-release/exec",
         {
-          "prepareCmd": "bumpversion --allow-dirty --no-commit --no-tag --new-version ${nextRelease.version} patch && pre-commit run --all-files end-of-file-fixer || true && rm -rf dist/ && poetry build && twine upload --verbose --disable-progress-bar --skip-existing --password $TWINE_TEST_PASSWORD -r testpypi dist/*",
+          "prepareCmd": "bumpversion --allow-dirty --no-commit --no-tag --new-version ${nextRelease.version} patch && pre-commit run --all-files || true && rm -rf dist/ && poetry build && twine upload --verbose --disable-progress-bar --skip-existing --password $TWINE_TEST_PASSWORD -r testpypi dist/*",
           "publishCmd": "twine upload --verbose --disable-progress-bar --skip-existing dist/*"
         }
       ],
@@ -27,7 +27,7 @@
         "@semantic-release/git",
         {
           "assets": [
-            "setup.cfg",
+            ".bumpversion.cfg",
             "src/nitpick/__init__.py",
             "pyproject.toml",
             "package.json",
@@ -55,9 +55,9 @@
           "cli",
           "flake8",
           "style",
-          "pre-commit",
-          "pyproject.toml",
-          "setup.cfg",
+          "yaml",
+          "toml",
+          "ini",
           "json",
           "deps",
           "deps-dev",

setup.cfg

@@ -27,121 +27,5 @@ warn_no_return = True
 warn_redundant_casts = True
 warn_unused_ignores = True
 
-[tool:pytest]
-addopts = -v
-norecursedirs = .* build dist CVS _darcs {arch} *.egg venv var docs
-# https://docs.pytest.org/en/stable/reference.html#confval-testpaths
-testpaths = src tests
-
-[tox:tox]
-# https://tox.readthedocs.io/en/latest/config.html
-isolated_build = True
-envlist = clean,lint,py39,py38,py37,py36,docs,report
-
-[gh-actions]
-# https://github.com/ymyzk/tox-gh-actions
-python =
-    3.9: py39
-    3.8: py38, clean, lint, docs, report
-    3.7: py37
-    3.6: py36
-
-[testenv]
-description = Run tests with pytest and coverage
-extras = test
-depends =
-    {py39,py38,py37,py36}: clean
-    report: py39,py38,py37,py36
-setenv =
-    PY_IGNORE_IMPORTMISMATCH = 1
-commands =
-    python -m pip --version
-    # https://pytest-cov.readthedocs.io/en/latest/config.html#caveats
-    # https://docs.pytest.org/en/stable/skipping.html
-    python -m pytest --cov-config=setup.cfg --cov --cov-append --cov-report=term-missing --doctest-modules -s -rxXs {posargs:-vv}
-
-[testenv:clean]
-description = Erase data for the coverage report before running tests
-platform = linux|darwin
-skip_install = true
-deps = coverage
-commands = coverage erase
-
-[testenv:lint]
-description = Lint all files with pre-commit
-basepython = python3.8
-platform = linux|darwin
-# pylint needs both these extras:
-extras =
-    # Install pylint itself
-    lint
-    # For pylint to inspect tests
-    test
-deps =
-    pip>=19.2
-    safety
-# Run nitpick and pylint with tox, because local repos don't seem to work well with https://pre-commit.ci/
-commands =
-    # Run Nitpick locally on itself
-    flake8 --select=NIP
-    pylint src/
-    safety check
-
-[testenv:report]
-description = Coverage report
-platform = linux|darwin
-skip_install = true
-deps = coverage
-commands =
-    coverage report
-    coverage html
-
-[testenv:docs]
-description = Build the HTML docs using Sphinx (sphinx-build, API docs, link checks)
-basepython = python3.8
-platform = linux|darwin
-extras = doc
-commands =
-    python3 docs/generate_rst.py
-    sphinx-apidoc --force --follow-links --module-first --separate --implicit-namespaces --ext-autodoc --ext-doctest --ext-intersphinx --ext-todo --ext-coverage --ext-imgmath --ext-mathjax --ext-ifconfig --ext-viewcode --ext-githubpages --output-dir docs/source src/nitpick/
-    # To stop failing when a page is unreachable, add a hyphen at the start of the line:
-    # https://tox.readthedocs.io/en/latest/example/basic.html#ignoring-exit-code
-    # Some errors during link check have to be ignored.
-    # E.g.: when a new TOML style is added, its link will be broken until a new release is published.
-    - sphinx-build --color -j auto -b linkcheck docs "{toxworkdir}/docs_out"
-    # Use these options to debug Sphinx: -nWT --keep-going -vvv
-    sphinx-build --color -j auto -d "{toxworkdir}/docs_doctree" -b html docs "{toxworkdir}/docs_out" {posargs}
-
-[coverage:run]
-# https://coverage.readthedocs.io/en/latest/config.html#run
-branch = true
-parallel = true
-source = src/
-omit =
-    tests/*
-    .tox/*
-# This config is needed by https://github.com/marketplace/actions/coveralls-python#usage
-relative_files = True
-
-[coverage:report]
-# https://coverage.readthedocs.io/en/latest/config.html#report
-show_missing = true
-precision = 2
-skip_covered = true
-skip_empty = true
-sort = Cover
-
-# https://coverage.readthedocs.io/en/latest/excluding.html#advanced-exclusion
-exclude_lines =
-    pragma: no cover
-    def __repr__
-    if self.debug:
-    if settings.DEBUG
-    if TYPE_CHECKING:
-    raise AssertionError
-    raise NotImplementedError
-    if 0:
-    if __name__ == .__main__.:
-
 [bandit]
 exclude = tests/*

src/nitpick/plugins/ini.py

@@ -37,6 +37,7 @@ class IniPlugin(NitpickPlugin):
 
     - `setup.cfg <https://docs.python.org/3/distutils/configfile.html>`_
     - `.editorconfig <https://editorconfig.org/>`_
+    - `tox.ini <https://tox.readthedocs.io/en/latest/>`_
 
     Style examples enforcing values on INI files: :ref:`flake8 configuration <example-flake8>`.
     """
@@ -112,7 +113,7 @@ def remove_top_section(multiline_text: str) -> str:
         return "\n".join(line for line in multiline_text.splitlines() if TOP_SECTION not in line)
 
     def get_missing_output(self) -> str:
-        """Get a missing output string example from the missing sections in setup.cfg."""
+        """Get a missing output string example from the missing sections in an INI file."""
         missing = self.missing_sections
         if not missing:
             return ""
@@ -130,7 +131,7 @@ def get_missing_output(self) -> str:
 
     # TODO: convert the contents to dict (with IniConfig().sections?) and mimic other plugins doing dict diffs
     def enforce_rules(self) -> Iterator[Fuss]:
-        """Enforce rules on missing sections and missing key/value pairs in setup.cfg."""
+        """Enforce rules on missing sections and missing key/value pairs in an INI file."""
         try:
             yield from self._read_file()
         except Error:
@@ -218,7 +219,7 @@ def enforce_comma_separated_values(self, section, key, raw_actual: Any, raw_expe
     def compare_different_keys(self, section, key, raw_actual: Any, raw_expected: Any) -> Iterator[Fuss]:
         """Compare different keys, with special treatment when they are lists or numeric."""
         if isinstance(raw_actual, (int, float, bool)) or isinstance(raw_expected, (int, float, bool)):
-            # A boolean "True" or "true" has the same effect on setup.cfg.
+            # A boolean "True" or "true" has the same effect on ConfigParser files.
             actual = str(raw_actual).lower()
             expected = str(raw_expected).lower()
         else:

src/nitpick/schemas.py

@@ -6,7 +6,7 @@
 from sortedcontainers import SortedDict
 
 from nitpick import fields
-from nitpick.constants import READ_THE_DOCS_URL
+from nitpick.constants import READ_THE_DOCS_URL, SETUP_CFG
 from nitpick.generic import flatten
 
 
@@ -44,7 +44,7 @@ class NitpickStylesSectionSchema(BaseNitpickSchema):
 
 
 class IniSchema(BaseNitpickSchema):
-    """Validation schema for setup.cfg."""
+    """Validation schema for INI files."""
 
     error_messages = {"unknown": help_message("Unknown configuration", "nitpick_section.html#comma-separated-values")}
 
@@ -59,7 +59,7 @@ class NitpickFilesSectionSchema(BaseNitpickSchema):
     absent = fields.Dict(fields.NonEmptyString, fields.String())
     present = fields.Dict(fields.NonEmptyString, fields.String())
     # TODO: load this schema dynamically, then add this next field setup_cfg
-    setup_cfg = fields.Nested(IniSchema, data_key="setup.cfg")
+    setup_cfg = fields.Nested(IniSchema, data_key=SETUP_CFG)
 
 
 class NitpickSectionSchema(BaseNitpickSchema):

src/nitpick/style.py

@@ -294,7 +294,7 @@ def file_field_pair(filename: str, base_file_class: Type[NitpickPlugin]) -> Dict
         if base_file_class.validation_schema:
             field = fields.Nested(base_file_class.validation_schema, **kwargs)
         else:
-            # For default files (pyproject.toml, setup.cfg...), there is no strict schema;
+            # For some files (e.g.: pyproject.toml, INI files), there is no strict schema;
             # it can be anything they allow.
             # It's out of Nitpick's scope to validate those files.
             field = fields.Dict(fields.String, **kwargs)
@@ -321,7 +321,7 @@ def rebuild_dynamic_schema(self, data: JsonDict = None) -> None:
         if data is None:
             # Data is empty; so this is the first time the dynamic class is being rebuilt.
             # Loop on classes with predetermined names, and add fields for them on the dynamic validation schema.
-            # E.g.: setup.cfg, pre-commit, pyproject.toml: files whose names we already know at this point.
+            # E.g.: pre-commit, pyproject.toml: files whose names we already know at this point.
             for subclass in fixed_name_classes:
                 new_files_found.update(self.file_field_pair(subclass.filename, subclass))
         else:

tasks.py

@@ -19,7 +19,7 @@ class ToxCommands:
 
     def __init__(self) -> None:
         self._parser = ConfigParser()
-        self._parser.read("setup.cfg")
+        self._parser.read("tox.ini")
 
     def list_commands(self, section: str) -> Iterator[str]:
         """List all commands in a section."""

tests/test_config.py

@@ -1,6 +1,7 @@
 """Config tests."""
 import pytest
 
+from nitpick.constants import PYPROJECT_TOML, SETUP_CFG
 from nitpick.core import Nitpick
 from tests.helpers import ProjectMock
 
@@ -83,10 +84,10 @@ def test_django_project_structure(tmp_path):
     ).touch_file(
         "my_django_project/manage.py"
     ).style(
-        """
-        ["pyproject.toml".tool.black]
+        f"""
+        ["{PYPROJECT_TOML}".tool.black]
         lines = 100
-        ["setup.cfg".flake8]
+        ["{SETUP_CFG}".flake8]
         some = "thing"
         """
     ).api_check_then_apply()