Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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 .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- main
- free_some_deps
schedule:
- cron: "0 0 * * *"

Expand Down
6 changes: 3 additions & 3 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ dependencies:

# R and dependencies
- cdo
- r-base >=3.5
- r-base >=4.4
- r-abind
- r-akima
- r-climdex.pcic
Expand All @@ -123,5 +123,5 @@ dependencies:
- r-yaml
# R packages needed for development
- r-git2r # dependency of lintr
- r-lintr ==3.1.2
- r-styler ==1.10.3
Comment thread
valeriupredoi marked this conversation as resolved.
- r-lintr
- r-styler

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We should be able to get rid of those if we re-enable the pre-commit hook at

# - repo: https://github.com/lorenzwalthert/precommit/ # Checks for R
# rev: 'v0.4.2'
# hooks:
# - id: style-files # styler
# - id: lintr
# - repo: https://github.com/codespell-project/codespell
# rev: 'v2.3.0'
# hooks:
# - id: codespell

and perform the currently failing test using pre-commit instead.

We would just need to pin that pre-commit hook to the version where the checks passed (i.e. the version of the pre-commit hook that uses the versions of lintr and styler listed here).

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

all fun and games until I realized I lost you at pinning the pre-commit hook - how the heck would we know the version when that hook last passed the test? Unless you want me to write a Monte Carlo routine that loops over lintr hook versions 🀣

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

can we not just skip the R-linting test in tests/unit/test_lint.py? I've not seen any of the following in the past 5 years:

  • anyone writing a recipe in R
  • anyone complaining that our R recipes don't follow R linting standards

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

actually, scratch that - it's prob a good idea to have an r-lintr test, let me see what I can do with that pre-commit version, I'll toss some coins πŸͺ™

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've not forgot about this, am gonna try have a look at it tomorrow - sorry, I've been under a lot of snow elsewhere, bud

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

pre-commit config file brought back to original state in a2c5d63 - off to the docs to add the mention about style etc

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

docs modded in 88f3e41 - do we want to tell R folks to use the pre-commit way or r-linrs/styler way?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the changes V! I pushed a few additions to the docs in fdddae6 and removed the unit test that checks compliance with lintr as we want this done with pre-commit instead.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Looks great! I had doubts about keeping that fully skipped test, but I was afraid we'd have to use it again in the future should the R hook be left undeveloped (it diesn't look too actively maintained). Shall we merge then? 🍺

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yes, but let's first fix the docs build

Loading