Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,30 @@ jobs:
- name: test (blocking)
run: make test

- name: Dump reports on failure
if: ${{ failure() }}
run: |
set -eu
for f in .reports/workspace/test/*.log; do
[ -f "$f" ] || continue
echo "::group::workspace $(basename "$f")"
tail -n 200 "$f"
echo "::endgroup::"
done
for f in apps/*/.reports/tests/*/pytest.log .reports/tests/*/pytest.log; do
[ -f "$f" ] || continue
echo "::group::$f"
tail -n 200 "$f"
echo "::endgroup::"
done
- name: Upload reports on failure
if: ${{ failure() }}
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: flext-ci-reports-${{ github.run_id }}
path: |
.reports/**
apps/*/.reports/**
if-no-files-found: ignore
retention-days: 7
# End SECTION: ci job
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,11 @@ show_missing = true
skip_covered = false

[tool.coverage.run]
omit = ["*/dependency_injector/providers.pyx"]
omit = [
"*/_protocols/*",
"*/dependency_injector/providers.pyx",
"*/protocols.py",
]
source = ["src"]

# [MANAGED] deptry
Expand Down
58 changes: 29 additions & 29 deletions src/flext_cli/_models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from flext_core.lazy import build_lazy_import_map, install_lazy_exports

if TYPE_CHECKING:
from . import _base_parts as _base_parts
from . import _base as _base
from .base import FlextCliModelsBase as FlextCliModelsBase
from .config import FlextCliConfigModels as FlextCliConfigModels
from .docx import FlextCliModelsDocx as FlextCliModelsDocx
Expand All @@ -22,30 +22,30 @@
from .rules import FlextCliModelsRules as FlextCliModelsRules
from .template import FlextCliModelsTemplate as FlextCliModelsTemplate
from .xlsx import FlextCliModelsXlsx as FlextCliModelsXlsx
from .xlsx_archive import FlextCliModelsXlsxArchive as FlextCliModelsXlsxArchive
from .xlsx_cells import FlextCliModelsXlsxCells as FlextCliModelsXlsxCells
from .xlsx_layout import FlextCliModelsXlsxLayout as FlextCliModelsXlsxLayout
from .xlsx_recalc import FlextCliModelsXlsxRecalc as FlextCliModelsXlsxRecalc
from .xlsx_rules import FlextCliModelsXlsxRules as FlextCliModelsXlsxRules
from .xlsx_snapshot import FlextCliModelsXlsxSnapshot as FlextCliModelsXlsxSnapshot
from .xlsx_style_catalog import (
from ._xlsx.xlsx_archive import FlextCliModelsXlsxArchive as FlextCliModelsXlsxArchive
from ._xlsx.xlsx_cells import FlextCliModelsXlsxCells as FlextCliModelsXlsxCells
from ._xlsx.xlsx_layout import FlextCliModelsXlsxLayout as FlextCliModelsXlsxLayout
from ._xlsx.xlsx_recalc import FlextCliModelsXlsxRecalc as FlextCliModelsXlsxRecalc
from ._xlsx.xlsx_rules import FlextCliModelsXlsxRules as FlextCliModelsXlsxRules
from ._xlsx.xlsx_snapshot import FlextCliModelsXlsxSnapshot as FlextCliModelsXlsxSnapshot
from ._xlsx.xlsx_style_catalog import (
FlextCliModelsXlsxStyleCatalog as FlextCliModelsXlsxStyleCatalog,
)
from .xlsx_style_fills import (
from ._xlsx.xlsx_style_fills import (
FlextCliModelsXlsxStyleFills as FlextCliModelsXlsxStyleFills,
)
from .xlsx_style_primitives import (
from ._xlsx.xlsx_style_primitives import (
FlextCliModelsXlsxStylePrimitives as FlextCliModelsXlsxStylePrimitives,
)
from .xlsx_styles import FlextCliModelsXlsxStyles as FlextCliModelsXlsxStyles
from .xlsx_tables import FlextCliModelsXlsxTables as FlextCliModelsXlsxTables
from .xlsx_validation import (
from ._xlsx.xlsx_styles import FlextCliModelsXlsxStyles as FlextCliModelsXlsxStyles
from ._xlsx.xlsx_tables import FlextCliModelsXlsxTables as FlextCliModelsXlsxTables
from ._xlsx.xlsx_validation import (
FlextCliModelsXlsxValidation as FlextCliModelsXlsxValidation,
)
from .xlsx_workbook import FlextCliModelsXlsxWorkbook as FlextCliModelsXlsxWorkbook
from ._xlsx.xlsx_workbook import FlextCliModelsXlsxWorkbook as FlextCliModelsXlsxWorkbook

_LAZY_MODULES: dict[str, tuple[str, ...]] = {
"._base_parts": ("_base_parts",),
"._base": ("_base",),
".base": ("FlextCliModelsBase",),
".config": ("FlextCliConfigModels",),
".docx": ("FlextCliModelsDocx",),
Expand All @@ -57,19 +57,19 @@
".rules": ("FlextCliModelsRules",),
".template": ("FlextCliModelsTemplate",),
".xlsx": ("FlextCliModelsXlsx",),
".xlsx_archive": ("FlextCliModelsXlsxArchive",),
".xlsx_cells": ("FlextCliModelsXlsxCells",),
".xlsx_layout": ("FlextCliModelsXlsxLayout",),
".xlsx_recalc": ("FlextCliModelsXlsxRecalc",),
".xlsx_rules": ("FlextCliModelsXlsxRules",),
".xlsx_snapshot": ("FlextCliModelsXlsxSnapshot",),
".xlsx_style_catalog": ("FlextCliModelsXlsxStyleCatalog",),
".xlsx_style_fills": ("FlextCliModelsXlsxStyleFills",),
".xlsx_style_primitives": ("FlextCliModelsXlsxStylePrimitives",),
".xlsx_styles": ("FlextCliModelsXlsxStyles",),
".xlsx_tables": ("FlextCliModelsXlsxTables",),
".xlsx_validation": ("FlextCliModelsXlsxValidation",),
".xlsx_workbook": ("FlextCliModelsXlsxWorkbook",),
"._xlsx.xlsx_archive": ("FlextCliModelsXlsxArchive",),
"._xlsx.xlsx_cells": ("FlextCliModelsXlsxCells",),
"._xlsx.xlsx_layout": ("FlextCliModelsXlsxLayout",),
"._xlsx.xlsx_recalc": ("FlextCliModelsXlsxRecalc",),
"._xlsx.xlsx_rules": ("FlextCliModelsXlsxRules",),
"._xlsx.xlsx_snapshot": ("FlextCliModelsXlsxSnapshot",),
"._xlsx.xlsx_style_catalog": ("FlextCliModelsXlsxStyleCatalog",),
"._xlsx.xlsx_style_fills": ("FlextCliModelsXlsxStyleFills",),
"._xlsx.xlsx_style_primitives": ("FlextCliModelsXlsxStylePrimitives",),
"._xlsx.xlsx_styles": ("FlextCliModelsXlsxStyles",),
"._xlsx.xlsx_tables": ("FlextCliModelsXlsxTables",),
"._xlsx.xlsx_validation": ("FlextCliModelsXlsxValidation",),
"._xlsx.xlsx_workbook": ("FlextCliModelsXlsxWorkbook",),
}


Expand Down Expand Up @@ -105,7 +105,7 @@
"FlextCliModelsXlsxTables",
"FlextCliModelsXlsxValidation",
"FlextCliModelsXlsxWorkbook",
"_base_parts",
"_base",
)

__all__: tuple[str, ...] = tuple(_PUBLIC_EXPORTS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ def resolve(self) -> t.Cli.TypedExtractValue:
if source_mapping is not None
else _EMPTY_JSON_MAPPING
)
case _:
pass
return resolved_value

def _default_for_kind(self) -> t.Cli.TypedExtractValue:
Expand Down
Empty file.
14 changes: 7 additions & 7 deletions src/flext_cli/_models/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@

from __future__ import annotations

from flext_cli._models._base_parts.flextclimodelsbase_part_01 import (
from flext_cli._models._base.flextclimodelsbase_part_01 import (
FlextCliModelsBase as FlextCliModelsBasePart01,
)
from flext_cli._models._base_parts.flextclimodelsbase_part_02 import (
from flext_cli._models._base.flextclimodelsbase_part_02 import (
FlextCliModelsBase as FlextCliModelsBasePart02,
)
from flext_cli._models._base_parts.flextclimodelsbase_part_03 import (
from flext_cli._models._base.flextclimodelsbase_part_03 import (
FlextCliModelsBase as FlextCliModelsBasePart03,
)
from flext_cli._models._base_parts.flextclimodelsbase_part_04 import (
from flext_cli._models._base.flextclimodelsbase_part_04 import (
FlextCliModelsBase as FlextCliModelsBasePart04,
)
from flext_cli._models._base_parts.flextclimodelsbase_part_05 import (
from flext_cli._models._base.flextclimodelsbase_part_05 import (
FlextCliModelsBase as FlextCliModelsBasePart05,
)
from flext_cli._models._base_parts.flextclimodelsbase_part_06 import (
from flext_cli._models._base.flextclimodelsbase_part_06 import (
FlextCliModelsBase as FlextCliModelsBasePart06,
)
from flext_cli._models._base_parts.flextclimodelsbase_part_07 import (
from flext_cli._models._base.flextclimodelsbase_part_07 import (
FlextCliModelsBase as FlextCliModelsBasePart07,
)

Expand Down
22 changes: 11 additions & 11 deletions src/flext_cli/_models/xlsx.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

from __future__ import annotations

from .xlsx_archive import FlextCliModelsXlsxArchive
from .xlsx_cells import FlextCliModelsXlsxCells
from .xlsx_layout import FlextCliModelsXlsxLayout
from .xlsx_recalc import FlextCliModelsXlsxRecalc
from .xlsx_rules import FlextCliModelsXlsxRules
from .xlsx_snapshot import FlextCliModelsXlsxSnapshot
from .xlsx_style_catalog import FlextCliModelsXlsxStyleCatalog
from .xlsx_styles import FlextCliModelsXlsxStyles
from .xlsx_tables import FlextCliModelsXlsxTables
from .xlsx_validation import FlextCliModelsXlsxValidation
from .xlsx_workbook import FlextCliModelsXlsxWorkbook
from ._xlsx.xlsx_archive import FlextCliModelsXlsxArchive
from ._xlsx.xlsx_cells import FlextCliModelsXlsxCells
from ._xlsx.xlsx_layout import FlextCliModelsXlsxLayout
from ._xlsx.xlsx_recalc import FlextCliModelsXlsxRecalc
from ._xlsx.xlsx_rules import FlextCliModelsXlsxRules
from ._xlsx.xlsx_snapshot import FlextCliModelsXlsxSnapshot
from ._xlsx.xlsx_style_catalog import FlextCliModelsXlsxStyleCatalog
from ._xlsx.xlsx_styles import FlextCliModelsXlsxStyles
from ._xlsx.xlsx_tables import FlextCliModelsXlsxTables
from ._xlsx.xlsx_validation import FlextCliModelsXlsxValidation
from ._xlsx.xlsx_workbook import FlextCliModelsXlsxWorkbook


class FlextCliModelsXlsx(
Expand Down
1 change: 0 additions & 1 deletion tests/test_xlsx_render.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ def test_xlsx_render_executes_typed_runtime_plan() -> None:

tm.that(snapshot.success, eq=True, msg=snapshot.error)
tm.that(cached.success, eq=True, msg=cached.error)
tm.that(isinstance(snapshot.value, p.Cli.XlsxWorkbookSnapshot), eq=True)
tm.that(tuple(item.name for item in snapshot.value.sheets), eq=("Data", "Summary"))
data_snapshot = snapshot.value.sheets[0]
formula_cell = next(item for item in data_snapshot.cells if item.coordinate == "B2")
Expand Down
Loading