Skip to content

Commit

Permalink
Merge pull request #22 from nasa/feature/update-dependencies
Browse files Browse the repository at this point in the history
Feature/update dependencies
  • Loading branch information
danielfromearth authored Sep 20, 2023
2 parents 5ac3e3d + 43223f0 commit da6d505
Show file tree
Hide file tree
Showing 13 changed files with 462 additions and 1,102 deletions.
14 changes: 0 additions & 14 deletions .flake8

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/lint_and_test_and_bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ jobs:

- name: Lint
run: |
poetry run pylint ncompare
poetry run flake8 ncompare
poetry run ruff ncompare
- name: Test with pytest
run: |
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/lint_and_test_on_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ jobs:

- name: Lint
run: |
poetry run pylint ncompare
poetry run flake8 ncompare
poetry run ruff ncompare
- name: Test with pytest
run: |
Expand Down
31 changes: 16 additions & 15 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default_language_version:

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.7.0
rev: v3.11.0
hooks:
- id: pyupgrade
args: [ "--py39-plus" ]
Expand Down Expand Up @@ -36,25 +36,26 @@ repos:
"--rcfile=.pylintrc", # Link to your config file
]

- repo: https://github.com/pycqa/flake8
rev: 6.0.0
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: 'v0.0.290'
hooks:
- id: flake8
exclude: pyproject.toml, .git, __pycache__, old, build, dist
additional_dependencies: [ 'flake8-docstrings' ]
args:
- "--docstring-convention=numpy"
- "--max-line-length=120"
- "--ignore=E302"
- id: ruff
args: [ "--fix" ]

# https://github.com/python/black#version-control-integration
- repo: https://github.com/psf/black
rev: 23.9.1
hooks:
- id: black-jupyter

- repo: https://github.com/PyCQA/isort
rev: 5.12.0
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.5.1
hooks:
- id: isort
args: [ '--settings-file=pyproject.toml', "--add_imports='from __future__ import annotations'" ]
- id: mypy

- repo: https://github.com/kynan/nbstripout
rev: 0.6.0
rev: 0.6.1
hooks:
- id: nbstripout
files: ".ipynb"
Loading

0 comments on commit da6d505

Please sign in to comment.