Merge pull request #100 from bsweger/bs/fix-build-more-linting

bsweger · web-flow · commit 77f5b184e29e · 2025-12-15T20:52:50.000-05:00
Fix build, more linting
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -34,5 +34,3 @@ updates:
         update-types:
           - patch
           - minor
-
-
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -30,6 +30,8 @@ jobs:
 
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
+        with:
+          version: "0.9.16"
 
       - name: Set nox session matrices 🧩
         id: set-matrix
@@ -49,6 +51,8 @@ jobs:
 
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
+        with:
+          version: "0.9.16"
 
       - name: Lint 🧹
         run: uvx nox --session lint
@@ -68,6 +72,8 @@ jobs:
 
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
+        with:
+          version: "0.9.16"
 
       - name: Generate coverage report 📊
         # The coverage session runs the test suite using the latest stable
@@ -99,6 +105,8 @@ jobs:
 
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
+        with:
+          version: "0.9.16"
 
       - name: Run nox test session ${{ matrix.nox_tests }} 🧪
         run: uvx nox --session ${{ matrix.nox_tests }}
@@ -118,6 +126,8 @@ jobs:
 
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
+        with:
+          version: "0.9.16"
 
       - name: Run nox docs session 📜
         run: uvx nox --session docs
diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
@@ -36,6 +36,8 @@ jobs:
 
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
+        with:
+          version: "0.9.16"
 
       - name: Build Sphinx docs 🗿
         shell: bash
@@ -62,4 +64,3 @@ jobs:
         with:
           artifact_name: static-docs
           token: ${{ github.token }}
-
diff --git a/.github/workflows/publish-pypi.yaml b/.github/workflows/publish-pypi.yaml
@@ -32,6 +32,8 @@ jobs:
 
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
+        with:
+          version: "0.9.16"
 
       - name: Build package for distribution 🛠️
         run: |
diff --git a/.github/workflows/run-checks.yaml b/.github/workflows/run-checks.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
         with:
-          version: "0.7.3"
+          version: "0.9.16"
 
       - name: Set nox session matrices 🧩
         id: set-matrix
@@ -58,7 +58,7 @@ jobs:
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
         with:
-          version: "0.7.3"
+          version: "0.9.16"
 
       - name: Run nox test_dev_install session ${{ matrix.nox_test_dev_install }} 🧪
         run: uvx nox --session ${{ matrix.nox_test_dev_install }}
@@ -82,7 +82,7 @@ jobs:
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
         with:
-          version: "0.7.3"
+          version: "0.9.16"
 
       - name: Run nox test_pypi_install session ${{ matrix.nox_test_pypi_install }} 🧪
         run: uvx nox --session ${{ matrix.nox_test_pypi_install }}
@@ -104,7 +104,7 @@ jobs:
       - name: Install uv 🌟
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 #v7.1.4
         with:
-          version: "0.7.3"
+          version: "0.9.16"
 
       - name: Build package for distribution 🛠️
         run: uv build
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,16 +21,22 @@ repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v6.0.0
   hooks:
-  - id: trailing-whitespace
+  - id: check-merge-conflict
+  - id: check-toml
   - id: check-yaml
     args: [--allow-multiple-documents]
   - id: debug-statements
   - id: detect-aws-credentials
     args: [--allow-missing-credentials]
   - id: detect-private-key
-  - id: double-quote-string-fixer
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
 - repo: https://github.com/codespell-project/codespell
   rev: v2.4.1
   hooks:
   - id: codespell
     args: ['--skip', 'test/__snapshots__/*.*', '--ignore-words-list', 'parsin']
+- repo: https://github.com/rhysd/actionlint
+  rev: v1.7.9
+  hooks:
+    - id: actionlint
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ project uses [Semantic Versioning](https://semver.org/).
 ### Added
 
 - Add a config mechanism that works via config.toml or env variables
+- Add new hooks to the .pre-commit-config.yaml template
 
 ### Changed
 
@@ -23,6 +24,7 @@ project uses [Semantic Versioning](https://semver.org/).
 - Set logging level via application configuration instead of hard-coding
 - Add cooldown to project Dependabot settings
 - Switching default quote style from single to double
+- Pin GitHub actions uv installs to the same version
 
 ## 0.5.7
 
diff --git a/LICENSE b/LICENSE
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -70,7 +70,7 @@
 # project information
 now = datetime.now()
 project = "pyprefab"
-copyright = f'{now.year}, Becky Sweger | Last update {now.strftime("%B %d, %Y")}'
+copyright = f"{now.year}, Becky Sweger | Last update {now.strftime('%B %d, %Y')}"
 author = "Becky Sweger"
 
 version = metadata.version("pyprefab")
diff --git a/src/pyprefab/cli.py b/src/pyprefab/cli.py
@@ -241,7 +241,8 @@ def main(
             package=name,
             directory=str(target_dir),
             error=str(e),
-            traceback=traceback.format_exc())
+            traceback=traceback.format_exc(),
+        )
         raise typer.Exit(1)
 
     logger.debug("package created", package=name, directory=str(target_dir))
diff --git a/src/pyprefab/config.toml b/src/pyprefab/config.toml
@@ -1,3 +1,2 @@
 [logging]
 level = 'INFO'
-
diff --git a/src/pyprefab/templates/.github/dependabot.yaml.j2 b/src/pyprefab/templates/.github/dependabot.yaml.j2
@@ -29,4 +29,3 @@ updates:
           update-types:
             - patch
             - minor
-
diff --git a/src/pyprefab/templates/.github/workflows/ci.yaml.j2 b/src/pyprefab/templates/.github/workflows/ci.yaml.j2
@@ -115,4 +115,3 @@ jobs:
         {%- raw %}
         if: ${{ failure() }}
         {%- endraw %}
-
diff --git a/src/pyprefab/templates/.pre-commit-config.yaml.j2 b/src/pyprefab/templates/.pre-commit-config.yaml.j2
@@ -17,13 +17,21 @@ repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
   rev: v6.0.0
   hooks:
-  - id: trailing-whitespace
+  - id: check-merge-conflict
+  - id: check-toml
   - id: check-yaml
     args: [--allow-multiple-documents]
+  - id: debug-statements
   - id: detect-aws-credentials
     args: [--allow-missing-credentials]
   - id: detect-private-key
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
 - repo: https://github.com/codespell-project/codespell
   rev: v2.4.1
   hooks:
   - id: codespell
+- repo: https://github.com/rhysd/actionlint
+  rev: v1.7.9
+  hooks:
+    - id: actionlint
diff --git a/src/pyprefab/templates/LICENSE.j2 b/src/pyprefab/templates/LICENSE.j2
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/src/pyprefab/templates/docs/source/index.rst.j2 b/src/pyprefab/templates/docs/source/index.rst.j2
@@ -12,4 +12,4 @@
    CHANGELOG
 
 .. include:: readme.md
-   :parser: myst_parser.sphinx_
+   :parser: myst_parser.sphinx_
diff --git a/test/__snapshots__/test_templates.ambr b/test/__snapshots__/test_templates.ambr
@@ -249,6 +249,7 @@
   
   .. include:: readme.md
      :parser: myst_parser.sphinx_
+  
   '''
 # ---
 # name: test_docs_dir[readme.md]
@@ -382,7 +383,6 @@
               name: html-cov-report
               path: htmlcov
           if: ${{ failure() }}
-  
   '''
 # ---
 # name: test_gh_workflows[publish-pypi.yaml]
@@ -746,6 +746,7 @@
   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
+  
   '''
 # ---
 # name: test_meta_files[README.md]
diff --git a/test/conftest.py b/test/conftest.py
@@ -39,6 +39,6 @@ def cli_output_no_docs(tmp_path):
             "--dir",
             tmp_path,
         ],
-        input="n\n"
+        input="n\n",
     )
     return tmp_path, result
diff --git a/test/test_cli.py b/test/test_cli.py
@@ -104,7 +104,9 @@ def test_app_package_dir_callback(monkeypatch, tmp_path):
     package_dir = "~/test_package_dir"
     runner = CliRunner()
     # boolean prompts require explicit 'n' or 'y'
-    result = runner.invoke(app, ["--name", "pytest_package", "--author", "Py Test", "--dir", package_dir], input="''\nn\n")
+    result = runner.invoke(
+        app, ["--name", "pytest_package", "--author", "Py Test", "--dir", package_dir], input="''\nn\n"
+    )
     assert result.exit_code == 0
 
 

-Original file line number
+Diff line change
         update-types:
           - patch
           - minor
+-
+-