diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh index ab28d6e..98c2244 100644 --- a/.devcontainer/postCreateCommand.sh +++ b/.devcontainer/postCreateCommand.sh @@ -5,7 +5,6 @@ CODE=/workspaces/code ln -s $CODE_TEMPLATE/.venv $CODE/.venv ln -s $CODE_TEMPLATE/external/fgsl-1.6.0 $CODE/external/fgsl-1.6.0 -cp -r $CODE_TEMPLATE/efit_to_boozer $CODE/efit_to_boozer cp -r $CODE_TEMPLATE/libneo $CODE/libneo echo 'source /workspaces/code/activate.sh' >> $HOME/.bashrc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9c9a61..a913154 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ libneo: - set_branch - source scripts/setup/venv.sh - source scripts/setup/libneo.sh - - tar czf libneo-dev.tar.gz efit_to_boozer/ libneo/ .venv/ + - tar czf libneo-dev.tar.gz libneo/ .venv/ - upload_package libneo dev diff --git a/activate.sh b/activate.sh index 7b5fcf8..d4f19f8 100644 --- a/activate.sh +++ b/activate.sh @@ -37,7 +37,6 @@ add_to_path $CODE/local/bin add_to_path $CODE/bin export PATH add_to_library_path $CODE/libneo/build -add_to_library_path $CODE/efit_to_boozer/build add_to_library_path $CODE/local/lib add_to_library_path $CODE/lib export LD_LIBRARY_PATH diff --git a/scripts/clone_all.sh b/scripts/clone_all.sh index 9802553..fb3a9a0 100755 --- a/scripts/clone_all.sh +++ b/scripts/clone_all.sh @@ -1,7 +1,6 @@ #!/bin/bash -GITHUB_REPOS="libneo spline BOOZER_MAGFIE SIMPLE GORILLA GORILLA_APPLETS NEO-2 NEO-RT" -GITLAB_REPOS="MEPHIT kim efit_to_boozer" +GITHUB_REPOS="libneo spline BOOZER_MAGFIE SIMPLE GORILLA GORILLA_APPLETS NEO-2 NEO-RT MEPHIT KAMEL" for REPO in $GITHUB_REPOS; do clone_github $REPO diff --git a/scripts/reset.sh b/scripts/reset.sh index dcb3a4b..eafa9da 100644 --- a/scripts/reset.sh +++ b/scripts/reset.sh @@ -6,7 +6,6 @@ deactivate rm -Rf .venv rm -Rf libneo -rm -Rf efit_to_boozer rm -Rf external/fgsl-1.6.0 diff --git a/scripts/setup/libneo.sh b/scripts/setup/libneo.sh index 2c4e0ac..514e50b 100755 --- a/scripts/setup/libneo.sh +++ b/scripts/setup/libneo.sh @@ -4,15 +4,6 @@ set -e source $CODE/scripts/util.sh -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 -popd - echo "Building and installing 'libneo'..." if [ ! -d "libneo" ] ; then echo "Cloning 'libneo'..." diff --git a/tests/efit_to_boozer/python/efit2boozer.cpython-311-x86_64-linux-gnu.so b/tests/efit_to_boozer/python/efit2boozer.cpython-311-x86_64-linux-gnu.so deleted file mode 120000 index b2d12b6..0000000 --- a/tests/efit_to_boozer/python/efit2boozer.cpython-311-x86_64-linux-gnu.so +++ /dev/null @@ -1 +0,0 @@ -../../../efit_to_boozer/python/efit2boozer.cpython-311-x86_64-linux-gnu.so \ No newline at end of file