Skip to content

Commit

Permalink
Merge pull request #522 from ONSAS/mvanzulli/refactor-toml
Browse files Browse the repository at this point in the history
  • Loading branch information
mvanzulli authored Nov 19, 2024
2 parents 416fa1c + 6d50f42 commit e710f0d
Show file tree
Hide file tree
Showing 90 changed files with 1,468 additions and 2,736 deletions.
19 changes: 1 addition & 18 deletions .JuliaFormatter.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1 @@
style = "yas"
always_use_return = false
indent = 4
margin = 100
always_for_in = true
remove_extra_newlines = true
short_to_long_function_def = true
whitespace_in_kwargs = false
annotate_untyped_fields_with_any = true
format_docstrings = false
separate_kwargs_with_semicolon = true
surround_whereop_typeparameters = true
whitespace_ops_in_indices = true
align_assignment = true
align_conditional = true
align_pair_arrow = true
align_matrix = true
import_to_using = false
style = "sciml"
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ docs/site/
# File generated by Pkg, the package manager, based on a corresponding Project.toml
# It records a fixed state of all packages used by the project.
# Since we are not actively develpoing this pkg by now let's commit versions
#Manifest.toml
Manifest.toml
test/Manifest.toml
docs/Manifest.toml

# Msh files
*.msh
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
92
],
"files.eol": "\n",
},
}
}
15 changes: 10 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,27 @@ PKG_NAME = ONSAS

# Update dependecies
update:
$(JULIA) --project=. -e 'import Pkg; Pkg.update()' && $(JULIA) --project=./docs/ -e 'import Pkg; Pkg.update()'
$(JULIA) --project=. -e 'import Pkg; Pkg.update()' &&
$(JULIA) --project=./docs/ -e 'import Pkg; Pkg.update()' &&
&& $(JULIA) --project=./test/ -e 'import Pkg; Pkg.update()'

# Update dependecies
instantiate:
$(JULIA) --project=. -e 'import Pkg; Pkg.instantiate()'
$(JULIA) --project=. -e 'import Pkg; Pkg.instantiate()' &&
$(JULIA) --project=./docs/ -e 'import Pkg; Pkg.instantiate()' &&
&& $(JULIA) --project=./test/ -e 'import Pkg; Pkg.instantiate()'

# Run all tests
tests:
$(JULIA) --project=. -e 'include("test/runtests.jl")'
$(JULIA) --project=. -e 'import Pkg; Pkg.test(;coverage=false, julia_args=["--check-bounds=yes", "--compiled-modules=yes"], force_latest_compatible_version=false, allow_reresolve=true)'

# Make docs
pages:
pages:
$(JULIA) --project=./docs/ -e 'import Pkg; Pkg.instantiate(); include("./docs/make.jl")'

# Remove generated files
clean:
find . -name "*.cov" -type f -exec rm -f {} +
find . -name "*.msh" -type f -exec rm -f {} +
find . -name "*.vti" -type f -exec rm -f {} +
find . -name "*.vtu" -type f -exec rm -f {} +
Expand All @@ -44,4 +49,4 @@ format:
$(JULIA) --project=. -e 'using JuliaFormatter; format(".", overwrite=true, verbose=true)'

# Run all tests
all: tests pages format-check clean
all: tests pages format-check clean
Loading

0 comments on commit e710f0d

Please sign in to comment.