Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch F90 format checker to fprettify. #1097

Merged
merged 1 commit into from
Aug 5, 2021
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
2 changes: 2 additions & 0 deletions .fprettify.rc
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ whitespace-multdiv = true
whitespace-print = true
whitespace-type = true
whitespace-intrinsics = true
enable-replacements = true
c-relations = true
3 changes: 1 addition & 2 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
### Purpose of Pull Request

* detail 1, refs #2 (github number)
* detail 2
* [Fixes re-git issue #3](https://re-git.lanl.gov/draco/draco/-/issues/3)

### Description of changes
Expand All @@ -16,7 +15,7 @@

* Reference:
* [Pre-Merge Code Review](https://github.com/lanl/Draco/wiki/Style-Guide)
* [CDash Status](https://rtt.lanl.gov/cdash/index.php?project=Draco&filtercount=1&showfilters=1&field1=buildname&compare1=63&value1=-pr)
* [CDash Status](https://rtt.lanl.gov/cdash3/index.php?project=Draco&filtercount=1&showfilters=1&field1=buildname&compare1=63&value1=-pr)
* Checks
* [ ] Travis/Appveyor CI checks pass
* [ ] Code coverage does not decrease
Expand Down
78 changes: 0 additions & 78 deletions environment/git/f90-format.el

This file was deleted.

2 changes: 1 addition & 1 deletion environment/git/install-hooks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
###########################################################
# CONFIGURATION:
# select which pre-commit hooks are going to be installed
HOOKS="pre-commit pre-commit-clang-format pre-commit-flake8 pre-commit-f90-format f90-format.el "
HOOKS="pre-commit pre-commit-clang-format pre-commit-flake8 pre-commit-fprettify"
HOOKS="$HOOKS pre-commit-cmake-format pre-commit-cmake-lint"
TOOLS="common.sh"
###########################################################
Expand Down
4 changes: 3 additions & 1 deletion environment/git/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@
# pre-commit hooks to be executed. They should be in the same .git/hooks/ folder as this
# script. Hooks should return 0 if successful and nonzero to cancel the commit. They are executed in
# the order in which they are listed.
HOOKS="pre-commit-clang-format pre-commit-f90-format"
HOOKS="pre-commit-clang-format"

# only run flake8 if the tool is available.
[[ $(which flake8 2> /dev/null | wc -w) -gt 0 ]] && HOOKS+=" pre-commit-flake8"
# only run cmake-format if the tool is available.
[[ $(which cmake-format 2> /dev/null | wc -w) -gt 0 ]] && HOOKS+=" pre-commit-cmake-format"
# only run cmake-lint if the tool is available.
[[ $(which cmake-lint 2> /dev/null | wc -w) -gt 0 ]] && HOOKS+=" pre-commit-cmake-lint"
# only run fprettify if the tool is available.
[[ $(which fprettify 2> /dev/null | wc -w) -gt 0 ]] && HOOKS+=" pre-commit-fprettify"

#--------------------------------------------------------------------------------------------------#

Expand Down
218 changes: 0 additions & 218 deletions environment/git/pre-commit-f90-format

This file was deleted.

Loading