Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ exclude: "docs|node_modules|migrations|.git|.tox"
default_stages: [commit]
fail_fast: true

# make sure these always match dev.yml and qa in pyproject.toml
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
Expand Down
10 changes: 4 additions & 6 deletions conda/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ dependencies:
# =================
- beautifulsoup4
- lxml
- matplotlib-base
- mpas_tools
- matplotlib-base >=3.8.2
- mpas_tools >=0.21.0
- netcdf4
- numpy >=2.0,<3.0
- output_viewer=1.3.3
Expand All @@ -38,16 +38,14 @@ dependencies:
# =======================
# Run `pre-commit autoupdate` to get the latest pinned versions of 'rev' in
# `.pre-commit.config.yaml`, then update the pinned versions here.
# Make sure to also update qa in pyproject.toml
- black ==25.1.0
- flake8 ==7.3.0
- isort ==6.0.1
#- mypy ==1.18.2
- mypy ==1.18.2
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If, in the future, the latest version of mypy or another pinned linting or CI tool is not available on conda-forge, use the latest version available on conda-forge both here and in the pre-commit config file, rather than pulling the tool from PyPI. This was @tomvothecoder's suggestion the last time this happened as well.

- pre-commit ==4.3.0
- types-PyYAML >=6.0.0
# Developer Tools
# =======================
- tbump=6.9.0
- ipykernel
# pip dependencies
- pip:
- mypy==1.18.2
13 changes: 7 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ docs = [
"sphinx-multiversion",
]

# make sure these always match dev.yml and .pre-commit-config.yaml
qa = [
"black==24.10.1",
"flake8==7.1.1",
"flake8-isort==6.1.0",
"isort==5.13.2",
"mypy==1.11.2",
"pre-commit >=3.0.0",
"black==25.1.0",
"flake8==7.3.0",
"flake8-isort==6.1.1",
"isort==6.0.1",
"mypy==1.18.2",
"pre-commit==4.3.0",
"types-PyYAML >=6.0.0",
Comment on lines +46 to 52
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@forsyth2, please double check these.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, these appear to match the current dev.yml and .pre-commit-config.yml.

]

Expand Down
Loading