Merge pull request #260 from nasa/release/1.11.0

Release/1.11.0

.github/workflows/build-pipeline.yml

@@ -27,7 +27,7 @@ jobs:
         python-version: 3.9
 
     - name: Install Poetry
-      uses: abatilo/[email protected].0
+      uses: abatilo/[email protected].1
       with:
         poetry-version: 1.3.2
 

.github/workflows/release_created.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.9
       - name: Install Poetry
-        uses: abatilo/[email protected].0
+        uses: abatilo/[email protected].1
         with:
           poetry-version: 1.3.2
       - name: Bump minor version

.github/workflows/reusable_run_tests.yml

@@ -29,7 +29,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Set up Poetry
-        uses: abatilo/[email protected].0
+        uses: abatilo/[email protected].1
         with:
           poetry-version: 1.3.2
 
@@ -45,7 +45,7 @@ jobs:
           poetry run pytest --cov=ncompare --cov-report=xml:build/reports/coverage${{ matrix.python-version }}.xml
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true

.pre-commit-config.yaml

@@ -1,42 +1,54 @@
+ci:
+  autoupdate_schedule: "monthly" # Like dependabot
+  autoupdate_commit_msg: "chore: update pre-commit hooks"
+  autoupdate_branch: "develop"
+  autofix_prs: false # Comment "pre-commit.ci autofix" on a PR to trigger
+
 default_language_version:
-  python: python3
+  python: python3.9
 
 repos:
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.21.2
     hooks:
-      - id: pyupgrade
-        args: [ "--py39-plus" ]
+      - id: gitleaks
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
-      - id: trailing-whitespace
-        exclude: ".txt"
-      - id: end-of-file-fixer
-        exclude: ".ipynb"
-      - id: check-json
+      # Validate format
       - id: check-yaml
         args: [ '--allow-multiple-documents' ]
+      - id: check-toml
+      - id: check-json
+      # Check for common mistakes
+      - id: check-added-large-files
+      - id: check-case-conflict
+      # - id: check-illegal-windows-names # TODO: Enable in next release
+      - id: check-merge-conflict
+      - id: check-executables-have-shebangs
+      - id: check-shebang-scripts-are-executable
+      - id: check-symlinks
+      - id: check-vcs-permalinks
+      - id: destroyed-symlinks
+      - id: detect-private-key
+      - id: end-of-file-fixer
+        exclude_types: ["jupyter", "text"]
+      - id: mixed-line-ending
+      - id: no-commit-to-branch # protects `main` by default
       - id: debug-statements
-      - id: pretty-format-json
-        args: ['--autofix', '--no-ensure-ascii', '--no-sort-keys']
+      - id: trailing-whitespace
+        exclude_types: ["jupyter", "text"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: 'v0.5.1'
+    rev: v0.7.3
     hooks:
       - id: ruff
-        args: [ "--fix" ]
-
-  # https://github.com/python/black#version-control-integration
-  - repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-      - id: black-jupyter
+        args: ["--fix", "--exit-non-zero-on-fix"]
+      - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.1
+    rev: v1.13.0
     hooks:
       - id: mypy
 

CHANGELOG.md

@@ -4,7 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Common Changelog](https://common-changelog.org/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [unreleased]
+## [1.11.0] - 2024-11-14
+
+### Added
+
+- Add pre-commit autoupdating ([#cde1ae4](https://github.com/nasa/ncompare/pull/260/commits/cde1ae4d7ae8b1d9cf07d4af012e8f97b010238d)) ([**@danielfromearth**](https://github.com/danielfromearth))
+- Add gitleaks to pre-commit ([#261](https://github.com/nasa/ncompare/pull/261)) ([**@danielfromearth**](https://github.com/danielfromearth))
+
+### Removed
+
+- Remove usage of black for code formatting ([#257](https://github.com/nasa/ncompare/pull/257)) ([**@danielfromearth**](https://github.com/danielfromearth))
+
+## [1.10.0] - 2024-07-10
 
 ### Changed
 

CONTRIBUTING.md

@@ -174,8 +174,7 @@ features or old documentation updated for any changed features
 
 ### Python Style Guide
 
-_Ncompare_ follows PEP8 as much as possible. Reference the _ruff_ and
-_black_ configuration sections in [pyproject.toml](pyproject.toml) for specific expectations.
+_Ncompare_ follows PEP8 as much as possible. Reference the _ruff_ configuration section in [pyproject.toml](pyproject.toml) for specific expectations.
 
 ### Documentation
 

README.md

@@ -16,9 +16,6 @@ _____
 <a href="https://pypi.org/project/ncompare" target="_blank">
     <img src="https://img.shields.io/pypi/v/ncompare?color=%2334D058label=pypi%20package" alt="Package version">
 </a>
-<a href="https://github.com/python/black" target="_blank">
-    <img src="https://img.shields.io/badge/code%20style-black-000000.svg" alt="Code style">
-</a>
 <a href="https://mypy-lang.org/" target="_blank">
     <img src="https://www.mypy-lang.org/static/mypy_badge.svg" alt="Mypy checked">
 </a>