Skip to content

Commit

Permalink
Merge pull request #311 from nsidc/pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
chore: update pre-commit hooks
  • Loading branch information
mfisher87 authored Jul 2, 2024
2 parents 4cab422 + e59a8e9 commit c205211
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ default_language_version:
repos:

- repo: "https://github.com/pre-commit/pre-commit-hooks"
rev: "v4.4.0"
rev: "v4.6.0"
hooks:
- id: "check-added-large-files"
- id: "check-case-conflict"
Expand All @@ -30,24 +30,24 @@ repos:
- id: "trailing-whitespace"

- repo: "https://github.com/astral-sh/ruff-pre-commit"
rev: "v0.1.7"
rev: "v0.5.0"
hooks:
- id: "ruff"
# NOTE: "--exit-non-zero-on-fix" is important for CI to function
# correctly!
args: ["--fix", "--exit-non-zero-on-fix"]

- repo: "https://github.com/psf/black"
rev: "23.3.0"
rev: "24.4.2"
hooks:
- id: "black"

# Format and validate CFF. NOTE: pre-commit doesn't recognize CFF as YAML
# (https://github.com/pre-commit/identify/pull/435), so we may need to
# specify the prettier hook twice if we want to format other things and avoid
# a messy regex.
- repo: "https://github.com/pre-commit/mirrors-prettier"
rev: "v3.1.0"
- repo: "https://github.com/rbubley/mirrors-prettier"
rev: "v3.3.2"
hooks:
- id: "prettier"
files: "CITATION.cff"
Expand All @@ -59,7 +59,7 @@ repos:
- "--verbose"

- repo: "https://github.com/codespell-project/codespell"
rev: "v2.2.4"
rev: "v2.3.0"
hooks:
- id: "codespell"
exclude: ".codespellignore"
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
## v0.3.0 (2023-08-17)

* Set up/improve all relationship interfaces
* Populate societal benfit area reference data
* Populate societal benefit area reference data
* Implement role dropdown on profile page

## v0.2.1 (2023-08-10)
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
level of experience, education, socioeconomic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.


Expand Down
2 changes: 1 addition & 1 deletion doc/how-to/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Bring up the docker container:
docker compose up -d
```

**The stack should now be up, with the web interface running at `locahost:5000`, and
**The stack should now be up, with the web interface running at `localhost:5000`, and
database administration at `localhost:8080`.**

You can follow the logs with:
Expand Down
1 change: 1 addition & 0 deletions usaon_benefit_tool/forms.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Forms corresponding to database models."""

from functools import partial

from flask_wtf import FlaskForm
Expand Down
1 change: 1 addition & 0 deletions usaon_benefit_tool/models/tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
https://docs.sqlalchemy.org/en/14/orm/basic_relationships.html#late-evaluation-of-relationship-arguments
"""

from datetime import datetime
from typing import ClassVar

Expand Down
1 change: 1 addition & 0 deletions usaon_benefit_tool/util/db/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* Execute each function within a transaction.
"""

import sqlalchemy
from flask import current_app
from loguru import logger
Expand Down
1 change: 1 addition & 0 deletions usaon_benefit_tool/util/flask_jsglue.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
"""

import json
import re

Expand Down
1 change: 1 addition & 0 deletions usaon_benefit_tool/util/sankey.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ def _handle_unlinked_sankey_nodes(
See Also
--------
https://stackoverflow.com/questions/73033817/highcharts-sankey-node-without-links
"""
orphan_nodes = [
n for n in series["nodes"] if n["id"] not in _node_ids_in_links(series["data"])
Expand Down

0 comments on commit c205211

Please sign in to comment.