From 6196905d5291c4596ec7b1683c21fb928d41a96c Mon Sep 17 00:00:00 2001 From: Christopher Albert Date: Wed, 2 Apr 2025 22:38:07 +0200 Subject: [PATCH 1/3] Add evaluation of fpm to CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc0bdfb..af9b3c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# April 2025 +- Evaluate use of fpm + # March 2025 - Integrate efit_to_boozer From 22701eac514dea896f47474fa1e94bc1c019a667 Mon Sep 17 00:00:00 2001 From: Christopher Albert Date: Wed, 2 Apr 2025 22:55:20 +0200 Subject: [PATCH 2/3] Reverse order for dependencies --- .gitlab-ci.yml | 2 +- scripts/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2acdf73..d8fd2b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,8 +75,8 @@ libneo: - source scripts/util.sh - set_branch - source scripts/setup/venv.sh - - source scripts/setup/efit_to_boozer.sh - source scripts/setup/libneo.sh + - source scripts/setup/efit_to_boozer.sh - tar czf libneo-dev.tar.gz libneo/ efit_to_boozer/ .venv/ - upload_package libneo dev diff --git a/scripts/setup.sh b/scripts/setup.sh index 211d510..7507add 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -16,6 +16,6 @@ pushd $CODE/external popd pushd $CODE - $CODE/scripts/setup/efit_to_boozer.sh $CODE/scripts/setup/libneo.sh + $CODE/scripts/setup/efit_to_boozer.sh popd From 0d49a48b3a19b9900c37ddfbdcac568484481816 Mon Sep 17 00:00:00 2001 From: Christopher Albert Date: Tue, 8 Apr 2025 23:58:38 +0200 Subject: [PATCH 3/3] Disable whitespace for type components --- .vscode/settings.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0fe7737..34f0dba 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -47,7 +47,6 @@ "--whitespace-relational", "--whitespace-logical", "--whitespace-print", - "--whitespace-type", "--whitespace-intrinsics", "--case", "1",