diff --git a/.gitignore b/.gitignore index c2deb46..3d90610 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ miniconda3_unstable # tests tests/**/out.* tests/**/*.dat -efit_to_boozer.inp tests/**/RUN* tests/**/*.png tests/**/build/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8fd2b4..6cd0cb6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,8 +76,7 @@ libneo: - set_branch - source scripts/setup/venv.sh - source scripts/setup/libneo.sh - - source scripts/setup/efit_to_boozer.sh - - tar czf libneo-dev.tar.gz libneo/ efit_to_boozer/ .venv/ + - tar czf libneo-dev.tar.gz libneo/ .venv/ - upload_package libneo dev @@ -176,4 +175,3 @@ gorilla: artifacts: paths: - GORILLA/ - diff --git a/CHANGELOG.md b/CHANGELOG.md index af9b3c4..e3f3a25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # April 2025 - Evaluate use of fpm +- Fully integrate efit_to_boozer # March 2025 - Integrate efit_to_boozer diff --git a/scripts/setup.sh b/scripts/setup.sh index 7507add..03dcbed 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -17,5 +17,4 @@ popd pushd $CODE $CODE/scripts/setup/libneo.sh - $CODE/scripts/setup/efit_to_boozer.sh popd diff --git a/scripts/setup/efit_to_boozer.sh b/scripts/setup/efit_to_boozer.sh deleted file mode 100755 index 0706e44..0000000 --- a/scripts/setup/efit_to_boozer.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -e - -source $CODE/scripts/util.sh -set_branch - -echo "Building and installing 'efit_to_boozer'..." -if [ ! -d "efit_to_boozer" ] ; then - echo "Cloning 'efit_to_boozer'..." - clone_github efit_to_boozer -fi -pushd efit_to_boozer -$CODE/scripts/checkout_branch.sh $CODE_BRANCH -pip install --verbose --no-build-isolation -e . -popd