envoy.code.check 0.6.0__tar.gz → 0.6.2__tar.gz

{envoy_code_check-0.6.0 → envoy_code_check-0.6.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: envoy.code.check
-Version: 0.6.0
-Summary: Code checker used in Envoy proxy's CI
+Version: 0.6.2
+Summary: Code checker used in Envoy proxy CI
 Home-page: https://github.com/envoyproxy/toolshed/tree/main/py/envoy.code.check
 Author: Ryan Northey
 Author-email: ryan@synca.io
@@ -21,35 +21,28 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
-Requires-Dist: abstracts==0.2.0
 Requires-Dist: abstracts>=0.2.0
-Requires-Dist: aio-core==0.11.0
-Requires-Dist: aio-run-checker==0.6.0
-Requires-Dist: aio.core>=0.11.0
-Requires-Dist: aio.run.checker>=0.6.0
-Requires-Dist: envoy-base-utils==0.6.0
-Requires-Dist: envoy.base.utils>=0.6.0
-Requires-Dist: flake8==7.3.0
+Requires-Dist: aio.core>=0.11.1
+Requires-Dist: aio.run.checker>=0.6.1
+Requires-Dist: envoy.base.utils==0.6.4-dev
+Requires-Dist: envoy.base.utils>=0.6.3
 Requires-Dist: flake8>=6.1.0
-Requires-Dist: packaging==26.2
 Requires-Dist: packaging>=23.0
 Requires-Dist: pep8-naming>=0.13.3
 Requires-Dist: types-pyyaml==6.0.12.20260508
-Requires-Dist: yamllint==1.38.0
 Requires-Dist: yamllint>=1.32.0
-Requires-Dist: yapf==0.43.0
 Requires-Dist: yapf>=0.40.2
 Provides-Extra: test
 Requires-Dist: pytest>=7.4.0; extra == "test"
 Requires-Dist: pytest-asyncio>=0.23.3; extra == "test"
-Requires-Dist: pytest-coverage; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-iters>=0.1.0; extra == "test"
 Requires-Dist: pytest-patches>=0.1.0; extra == "test"
 Provides-Extra: lint
 Requires-Dist: flake8>=6.1.0; extra == "lint"
 Provides-Extra: types
 Requires-Dist: mypy>=1.6.0; extra == "types"
-Requires-Dist: mypy-abstracts>=0.1.0; extra == "types"
+Requires-Dist: mypy-abstracts>=0.1.1; extra == "types"
 Provides-Extra: publish
 Requires-Dist: wheel>=0.41.0; extra == "publish"
 Dynamic: author

{envoy_code_check-0.6.0 → envoy_code_check-0.6.2}/envoy/code/check/abstract/changelog.py

@@ -1,5 +1,6 @@
 
 import itertools
+import pathlib
 from datetime import datetime
 from functools import cached_property
 from collections.abc import Iterator
@@ -11,6 +12,10 @@ import abstracts
 from aio.core.functional import async_property
 
 from envoy.base import utils
+from envoy.base.utils.abstract.project.changelog import (
+    CHANGELOG_ENTRY_GLOB,
+    ENTRY_SEPARATOR,
+)
 from envoy.code.check import abstract, interface
 
 
@@ -95,6 +100,50 @@ class AChangelogChangesChecker(metaclass=abstracts.Abstraction):
                 f"{version}/changes: Invalid `changes` section "
                 "(this is no longer used)")
 
+    def check_entry_filename(
+            self,
+            path: pathlib.Path) -> str | None:
+        section = path.parent.name
+        if section not in self.sections:
+            return (
+                f"{path}: Invalid section `{section}`. "
+                f"Valid sections: {sorted(self.sections)}")
+        if path.suffix != ".rst":
+            return (
+                f"{path}: Invalid file extension `{path.suffix}` "
+                "(expected `.rst`)")
+        if path.stem.count(ENTRY_SEPARATOR) != 1:
+            return (
+                f"{path}: Filename stem must contain exactly one "
+                f"`{ENTRY_SEPARATOR}` separator "
+                f"(expected `<area>{ENTRY_SEPARATOR}<slug>`)")
+        area, slug = path.stem.split(ENTRY_SEPARATOR, 1)
+        if not area:
+            return f"{path}: Area part of filename is empty"
+        if not slug:
+            return f"{path}: Slug part of filename is empty"
+        return None
+
+    def check_entry_content(
+            self,
+            path: pathlib.Path) -> str | None:
+        content = path.read_text()
+        if not content.strip():
+            return (
+                f"{path}: Entry file is empty or contains only whitespace")
+        return None
+
+    def check_entry_files(
+            self,
+            paths: list[pathlib.Path]) -> tuple[str, ...]:
+        errors = []
+        for path in paths:
+            if err := self.check_entry_filename(path):
+                errors.append(err)
+            if err := self.check_entry_content(path):
+                errors.append(err)
+        return tuple(errors)
+
 
 @abstracts.implementer(interface.IChangelogStatus)
 class AChangelogStatus(metaclass=abstracts.Abstraction):
@@ -136,15 +185,26 @@ class AChangelogStatus(metaclass=abstracts.Abstraction):
             and self.project.changelogs.changelog_path(
                 self.version).exists())
 
+    @property
+    def entry_dir(self) -> pathlib.Path | None:
+        if not self.is_current:
+            return None
+        return (
+            self.project.changelogs
+                        .changelog_path(self.version)
+                        .with_suffix(""))
+
     @async_property(cache=True)
     async def errors(self) -> tuple[str, ...]:
+        entry_errors = await self.check_entry_files()
         try:
             return (
                 *self.check_version(),
                 *await self.check_date(),
-                *await self.check_sections())
+                *await self.check_sections(),
+                *entry_errors)
         except utils.exceptions.ChangelogParseError as e:
-            return (f"{self.version}: {e}", )
+            return (*entry_errors, f"{self.version}: {e}")
 
     @async_property
     async def invalid_date(self) -> str | None:
@@ -215,6 +275,17 @@ class AChangelogStatus(metaclass=abstracts.Abstraction):
             self.version,
             await self.sections)
 
+    async def check_entry_files(self) -> tuple[str, ...]:
+        entry_dir = self.entry_dir
+        if entry_dir is None or not entry_dir.exists():
+            return ()
+        paths = sorted(entry_dir.glob(CHANGELOG_ENTRY_GLOB))
+        if not paths:
+            return ()
+        return await self.project.execute(
+            self.checker.check_entry_files,
+            paths)
+
     def check_version(self) -> tuple[str, ...]:
         errors = []
         if self.duplicate_current:

{envoy_code_check-0.6.0 → envoy_code_check-0.6.2}/envoy/code/check/interface.py

@@ -138,6 +138,24 @@ class IChangelogChangesChecker(metaclass=abstracts.Interface):
                 tuple[str, ...]):
         raise NotImplementedError
 
+    @abstracts.interfacemethod
+    def check_entry_filename(
+            self,
+            path: pathlib.Path) -> str | None:
+        raise NotImplementedError
+
+    @abstracts.interfacemethod
+    def check_entry_content(
+            self,
+            path: pathlib.Path) -> str | None:
+        raise NotImplementedError
+
+    @abstracts.interfacemethod
+    def check_entry_files(
+            self,
+            paths: list[pathlib.Path]) -> tuple[str, ...]:
+        raise NotImplementedError
+
 
 class IChangelogStatus(metaclass=abstracts.Interface):
     pass

{envoy_code_check-0.6.0 → envoy_code_check-0.6.2}/envoy.code.check.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: envoy.code.check
-Version: 0.6.0
-Summary: Code checker used in Envoy proxy's CI
+Version: 0.6.2
+Summary: Code checker used in Envoy proxy CI
 Home-page: https://github.com/envoyproxy/toolshed/tree/main/py/envoy.code.check
 Author: Ryan Northey
 Author-email: ryan@synca.io
@@ -21,35 +21,28 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
-Requires-Dist: abstracts==0.2.0
 Requires-Dist: abstracts>=0.2.0
-Requires-Dist: aio-core==0.11.0
-Requires-Dist: aio-run-checker==0.6.0
-Requires-Dist: aio.core>=0.11.0
-Requires-Dist: aio.run.checker>=0.6.0
-Requires-Dist: envoy-base-utils==0.6.0
-Requires-Dist: envoy.base.utils>=0.6.0
-Requires-Dist: flake8==7.3.0
+Requires-Dist: aio.core>=0.11.1
+Requires-Dist: aio.run.checker>=0.6.1
+Requires-Dist: envoy.base.utils==0.6.4-dev
+Requires-Dist: envoy.base.utils>=0.6.3
 Requires-Dist: flake8>=6.1.0
-Requires-Dist: packaging==26.2
 Requires-Dist: packaging>=23.0
 Requires-Dist: pep8-naming>=0.13.3
 Requires-Dist: types-pyyaml==6.0.12.20260508
-Requires-Dist: yamllint==1.38.0
 Requires-Dist: yamllint>=1.32.0
-Requires-Dist: yapf==0.43.0
 Requires-Dist: yapf>=0.40.2
 Provides-Extra: test
 Requires-Dist: pytest>=7.4.0; extra == "test"
 Requires-Dist: pytest-asyncio>=0.23.3; extra == "test"
-Requires-Dist: pytest-coverage; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-iters>=0.1.0; extra == "test"
 Requires-Dist: pytest-patches>=0.1.0; extra == "test"
 Provides-Extra: lint
 Requires-Dist: flake8>=6.1.0; extra == "lint"
 Provides-Extra: types
 Requires-Dist: mypy>=1.6.0; extra == "types"
-Requires-Dist: mypy-abstracts>=0.1.0; extra == "types"
+Requires-Dist: mypy-abstracts>=0.1.1; extra == "types"
 Provides-Extra: publish
 Requires-Dist: wheel>=0.41.0; extra == "publish"
 Dynamic: author

{envoy_code_check-0.6.0 → envoy_code_check-0.6.2}/envoy.code.check.egg-info/requires.txt

@@ -1,20 +1,13 @@
-abstracts==0.2.0
 abstracts>=0.2.0
-aio-core==0.11.0
-aio-run-checker==0.6.0
-aio.core>=0.11.0
-aio.run.checker>=0.6.0
-envoy-base-utils==0.6.0
-envoy.base.utils>=0.6.0
-flake8==7.3.0
+aio.core>=0.11.1
+aio.run.checker>=0.6.1
+envoy.base.utils==0.6.4-dev
+envoy.base.utils>=0.6.3
 flake8>=6.1.0
-packaging==26.2
 packaging>=23.0
 pep8-naming>=0.13.3
 types-pyyaml==6.0.12.20260508
-yamllint==1.38.0
 yamllint>=1.32.0
-yapf==0.43.0
 yapf>=0.40.2
 
 [lint]
@@ -26,10 +19,10 @@ wheel>=0.41.0
 [test]
 pytest>=7.4.0
 pytest-asyncio>=0.23.3
-pytest-coverage
+pytest-cov
 pytest-iters>=0.1.0
 pytest-patches>=0.1.0
 
 [types]
 mypy>=1.6.0
-mypy-abstracts>=0.1.0
+mypy-abstracts>=0.1.1

{envoy_code_check-0.6.0 → envoy_code_check-0.6.2}/setup.py

@@ -21,7 +21,7 @@ setup(**{
         'Topic :: Software Development',
         'Typing :: Typed',
     ],
-    'description': 'Code checker used in Envoy proxy\'s CI',
+    'description': 'Code checker used in Envoy proxy CI',
     'entry_points': {
         'console_scripts': [
             'envoy.code.check=envoy.code.check:run',
@@ -31,7 +31,7 @@ setup(**{
         'test': [
             'pytest>=7.4.0',
             'pytest-asyncio>=0.23.3',
-            'pytest-coverage',
+            'pytest-cov',
             'pytest-iters>=0.1.0',
             'pytest-patches>=0.1.0',
         ],
@@ -40,30 +40,23 @@ setup(**{
         ],
         'types': [
             'mypy>=1.6.0',
-            'mypy-abstracts>=0.1.0',
+            'mypy-abstracts>=0.1.1',
         ],
         'publish': [
             'wheel>=0.41.0',
         ],
     },
     'install_requires': (
-        'abstracts==0.2.0',
         'abstracts>=0.2.0',
-        'aio-core==0.11.0',
-        'aio-run-checker==0.6.0',
-        'aio.core>=0.11.0',
-        'aio.run.checker>=0.6.0',
-        'envoy-base-utils==0.6.0',
-        'envoy.base.utils>=0.6.0',
-        'flake8==7.3.0',
+        'aio.core>=0.11.1',
+        'aio.run.checker>=0.6.1',
+        'envoy.base.utils==0.6.4-dev',
+        'envoy.base.utils>=0.6.3',
         'flake8>=6.1.0',
-        'packaging==26.2',
         'packaging>=23.0',
         'pep8-naming>=0.13.3',
         'types-pyyaml==6.0.12.20260508',
-        'yamllint==1.38.0',
         'yamllint>=1.32.0',
-        'yapf==0.43.0',
         'yapf>=0.40.2',
     ),
     'license': 'Apache Software License 2.0',
@@ -130,5 +123,5 @@ Links
     ),
     'python_requires': '>=3.12',
     'url': 'https://github.com/envoyproxy/toolshed/tree/main/py/envoy.code.check',
-    'version': '0.6.0',
+    'version': '0.6.2',
 })