Skip to content

Commit

Permalink
Merge branch 'development' into codespell
Browse files Browse the repository at this point in the history
  • Loading branch information
mfisher87 authored Aug 16, 2024
2 parents cbd8def + b0bb832 commit b1e01c1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ repos:
- tomli

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.7
rev: v0.6.0
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stages:
jobs:
include:
- stage: basic tests
script: pytest icepyx/ --verbose --cov app --ignore icepyx/tests/test_behind_NSIDC_API_login.py
script: pytest icepyx/ --verbose --cov app --ignore=icepyx/tests/test_behind_NSIDC_API_login.py --ignore=icepyx/tests/test_auth.py
# includes an integrity check of the uploader as recommended by CodeCov
after_success:
- curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
Expand All @@ -41,4 +41,4 @@ jobs:
- stage: behind Earthdata
script:
- export EARTHDATA_PASSWORD=$NSIDC_LOGIN
- pytest icepyx/tests/test_behind_NSIDC_API_login.py
- pytest icepyx/tests/test_behind_NSIDC_API_login.py icepyx/tests/test_auth.py
6 changes: 6 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ version_file = "_icepyx_version.py"
version_file_template = 'version = "{version}"'
local_scheme = "node-and-date"
fallback_version = "unknown"


[tool.ruff]
# DevGoal: Lint and format all Jupyter Notebooks, remove below.
extend-exclude = ["*.ipynb"]

# [tool.ruff.format]
# docstring-code-format = true
# docstring-code-line-length = "dynamic"
Expand Down

0 comments on commit b1e01c1

Please sign in to comment.