Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/1.11.0 #260

Merged
merged 45 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0d02b49
/version 1.11.0a0
Jul 10, 2024
df055c2
Bump ruff from 0.5.0 to 0.5.1 in the pip-dependencies group
dependabot[bot] Jul 10, 2024
4eb309c
Merge pull request #250 from nasa/dependabot/pip/develop/pip-dependen…
danielfromearth Jul 11, 2024
103999f
/version 1.11.0a1
Jul 11, 2024
7a6ab3b
Bump the pip-dependencies group with 7 updates
dependabot[bot] Aug 1, 2024
1ce5c67
Merge pull request #251 from nasa/dependabot/pip/develop/pip-dependen…
danielfromearth Aug 2, 2024
44a5bbf
/version 1.11.0a2
Aug 2, 2024
ea24812
Bump the pip-dependencies group across 1 directory with 10 updates
dependabot[bot] Oct 1, 2024
a727ed6
Merge pull request #253 from nasa/dependabot/pip/develop/pip-dependen…
danielfromearth Oct 21, 2024
cb83870
/version 1.11.0a3
Oct 21, 2024
cde1ae4
Add ci autoupdate to .pre-commit-config.yaml
danielfromearth Nov 14, 2024
4d41ba8
/version 1.11.0a4
Nov 14, 2024
02b5602
Update .pre-commit-config.yaml
danielfromearth Nov 14, 2024
e195552
/version 1.11.0a5
Nov 14, 2024
a4cc51a
fix indent
danielfromearth Nov 14, 2024
be82a1b
/version 1.11.0a6
Nov 14, 2024
05d36be
autoupdate pre-commit
danielfromearth Nov 14, 2024
0603705
/version 1.11.0a7
Nov 14, 2024
284a240
update default_language_version
danielfromearth Nov 14, 2024
55b8cef
remove unused args and update hook exclusions
danielfromearth Nov 14, 2024
3931a16
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 14, 2024
ad00028
Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks"
danielfromearth Nov 14, 2024
51f9e24
use black without jupyter
danielfromearth Nov 14, 2024
1cca0fd
use only ruff for formatting, remove black
danielfromearth Nov 14, 2024
c6d8947
fixes from pre-commit, including using namedtuple for yield type in c…
danielfromearth Nov 14, 2024
a9c64a7
remove badge for black from README.md
danielfromearth Nov 14, 2024
8b72508
remove reference for black from CONTRIBUTING.md
danielfromearth Nov 14, 2024
fd0745f
Update CHANGELOG.md
danielfromearth Nov 14, 2024
805efd6
Merge pull request #257 from nasa/feature/issue-256-fix-pre-commit-du…
danielfromearth Nov 14, 2024
1ca39cb
/version 1.11.0a8
Nov 14, 2024
86d6580
Bump the gha-dependencies group across 1 directory with 2 updates
dependabot[bot] Nov 14, 2024
c893620
Merge pull request #259 from nasa/dependabot/github_actions/develop/g…
danielfromearth Nov 14, 2024
c94be2f
Bump the pip-dependencies group across 1 directory with 3 updates
dependabot[bot] Nov 14, 2024
fc016c5
/version 1.11.0a9
Nov 14, 2024
a54fa9c
Merge pull request #258 from nasa/dependabot/pip/develop/pip-dependen…
danielfromearth Nov 14, 2024
1d9aec1
/version 1.11.0a10
Nov 14, 2024
9c5c996
/version 1.11.0rc1
Nov 14, 2024
bbc7bfe
Merge branch 'main' into release/1.11.0
danielfromearth Nov 14, 2024
b531c3b
/version 1.11.0rc2
Nov 14, 2024
6014223
Update CHANGELOG.md
danielfromearth Nov 14, 2024
414a9ce
/version 1.11.0rc3
Nov 14, 2024
33c816d
add gitleaks hook to pre-commit
danielfromearth Nov 14, 2024
439266a
update CHANGELOG.md
danielfromearth Nov 14, 2024
c4a7bd9
Merge pull request #261 from nasa/feature/issue-112-add-gitleaks-chec…
danielfromearth Nov 14, 2024
b14b9bf
/version 1.11.0rc4
Nov 14, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_created.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable_run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
58 changes: 35 additions & 23 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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

Expand Down
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading