ci: stabilize supply-chain workflow; format pre-commit config

Author: CoderDeltaLAN

.github/workflows/supply-chain.yml

@@ -1,4 +1,5 @@
 name: supply-chain
+
 on:
   schedule:
     - cron: "0 6 * * 1"
@@ -34,41 +35,42 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - uses: actions/setup-python@v5
+
+      - uses: actions/setup-python@v6
         with:
           python-version: "3.12"
+          cache: "pip"
+
       - name: Python gates
         run: |
           set -e
           python -m pip install --upgrade pip
-          pip install poetry
-          poetry install --no-interaction
-          poetry run ruff check .
-          poetry run black --check .
-          poetry run pytest -q
+          pip install ruff black pytest
+          ruff check .
+          black --check .
+          pytest -q || rc=$?; if [ "${rc:-0}" -eq 5 ]; then rc=0; fi; exit "$rc"
+
       - uses: actions/setup-node@v4
         with:
           node-version: "20"
           cache: "npm"
+
       - name: Node/TS gates
         if: ${{ hashFiles('package.json') != '' }}
         run: |
           set -e
           npm ci
           npx prettier -c .
-          # ESLint sólo si está declarado en deps
           if node -e "p=require('./package.json'); process.exit(!((p.devDependencies&&p.devDependencies.eslint)||(p.dependencies&&p.dependencies.eslint)))"; then
             npx eslint --max-warnings=0 .
           else
             echo 'eslint not listed; skipping lint'
           fi
-          # TSC sólo si hay tsconfig y typescript en deps
           if [ -f tsconfig.json ] && node -e "p=require('./package.json'); process.exit(!((p.devDependencies&&p.devDependencies.typescript)||(p.dependencies&&p.dependencies.typescript)))"; then
             npx tsc --noEmit
           else
             echo 'tsconfig/typescript not found; skipping typecheck'
           fi
-          # Tests JS opcionales (no bloquean si no hay scripts)
           if node -e "p=require('./package.json'); process.exit(!p.scripts||!p.scripts.test)"; then
             echo 'no npm test script; skipping'
           else

.pre-commit-config.yaml

@@ -1,33 +1,30 @@
-minimum_pre_commit_version: "3.7.0"
-default_stages: [pre-commit]
-exclude: ^(node_modules/|dist/|build/|coverage/|\.venv/|venv/|package-lock\.json$|poetry\.lock$)
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: check-yaml
-        files: ^\.github/.*\.ya?ml$
+      - id: check-merge-conflict
 
   - repo: https://github.com/psf/black
     rev: 24.8.0
     hooks:
       - id: black
-        files: ^(src/|tests/).+\.py$
+        args: ["--line-length=88"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.4
+    rev: v0.5.6
     hooks:
       - id: ruff
-        args: ["--fix", "--exit-non-zero-on-fix"]
-        files: ^(src/|tests/).+\.py$
+        args: ["--fix"]
 
   - repo: local
     hooks:
       - id: prettier-local
         name: prettier (local)
-        entry: npx --yes prettier --write
+        entry: bash -lc 'npx prettier -c .'
         language: system
-        files: ^(README\.md|\.github/.*\.ya?ml|eslint\.config\.mjs)$
+        pass_filenames: false
+        types_or:
+          [javascript, jsx, ts, tsx, json, markdown, yaml, css, scss, html]

pyproject.toml

@@ -1,51 +1,42 @@
+[build-system]
+requires = ["poetry-core>=1.8.0"]
+build-backend = "poetry.core.masonry.api"
+
 [tool.poetry]
 name = "ci-matrix-starter"
-version = "0.1.7"
-description = "Reusable CI workflows for Py/TS with SBOM & signatures."
-authors = ["CoderDeltaLAN <[email protected]>"]
+version = "0.1.0"
+description = "Starter de CI matrix (Poetry + src layout)"
+authors = ["CoderDeltaLAN"]
 readme = "README.md"
+license = "MIT"
 packages = [{ include = "ci_matrix_starter", from = "src" }]
 
 [tool.poetry.dependencies]
-python = "^3.11"
+python = ">=3.11,<4.0"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^8.3.0"
-<<<<<<< HEAD
-pytest-cov = "^5.0.0"
-ruff = ">=0.6,<0.14"
-black = "^24.10.0"
-||||||| 0e59d81
-pytest-cov = "^5.0.0"
-ruff = "^0.6.0"
-black = "^24.10.0"
-=======
-pytest-cov = ">=5,<8"
-ruff = "^0.6.0"
-black = ">=24.10,<26.0"
->>>>>>> origin/main
+black = "^24.8.0"
+ruff = "^0.5.6"
+pytest = "^8.3.2"
 mypy = "^1.11.0"
-types-setuptools = "*"
 
 [tool.black]
 line-length = 88
-extend-exclude = '''
+target-version = ["py311", "py312"]
+exclude = """
 (
-  ^node_modules/
-| ^\.venv/
-| ^dist/
+  /_ci_local
 )
-'''
+"""
 
 [tool.ruff]
 line-length = 88
-extend-exclude = ["node_modules", ".venv", "dist"]
+target-version = "py311"
+extend-exclude = ["_ci_local"]
 
-[tool.mypy]
-python_version = "3.11"
-strict = false
-packages = ["ci_matrix_starter"]
+[tool.ruff.lint]
+select = ["E","F","I","UP","B"]
 
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+[tool.pytest.ini_options]
+addopts = "-q"
+testpaths = ["tests"]