From 0cb7eb087e2e595821d19c080a5f192d779f86a3 Mon Sep 17 00:00:00 2001 From: jbellister-slac Date: Thu, 2 Nov 2023 19:58:39 -0700 Subject: [PATCH] Fix issue with test script --- python3_rhel7_env.yml | 2 -- rhel7_devel.yml | 2 -- test.sh | 6 ++---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/python3_rhel7_env.yml b/python3_rhel7_env.yml index ac06718..6fa882e 100644 --- a/python3_rhel7_env.yml +++ b/python3_rhel7_env.yml @@ -86,8 +86,6 @@ dependencies: - pip: - Cheetah3 - ipaddress - - jax==0.4.16 - - jaxlib==0.4.16 - matlab-wrapper - opencv-contrib-python - p4p diff --git a/rhel7_devel.yml b/rhel7_devel.yml index 6e4414b..bea6fde 100644 --- a/rhel7_devel.yml +++ b/rhel7_devel.yml @@ -83,8 +83,6 @@ dependencies: - pip: - Cheetah3 - ipaddress - - jax>=0.4.16 - - jaxlib>=0.4.16 - matlab-wrapper - opencv-contrib-python - p4p diff --git a/test.sh b/test.sh index 7c51933..1ef37a5 100644 --- a/test.sh +++ b/test.sh @@ -3,11 +3,9 @@ # Temporary fix for a jax incompatibility, can be removed once that is resolved conda remove --force --offline --yes jax conda remove --force --offline --yes jaxlib -pip install jax==0.4.16 -pip install jaxlib==0.4.19 -pip install jaxtyping==0.2.21 +pip install jax # All tests to be run to verify the environment built correctly and will work as expected at run time git clone https://github.com/ChristopherMayes/Xopt.git -cd Xopt +pushd Xopt pytest