Merge branch 'main' into test_everything_always

C2SM · Oct 2, 2024 · eacc117 · eacc117
2 parents 677fd3f + a97d919
commit eacc117
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 68 deletions.
diff --git a/.github/workflows/auto_create_PR.yml b/.github/workflows/auto_create_PR.yml
diff --git a/create_new_sysconfig.sh b/create_new_sysconfig.sh
diff --git a/repos/c2sm/packages/python/package.py b/repos/c2sm/packages/python/package.py
diff --git a/status.sh b/status.sh
diff --git a/test/system_test.py b/test/system_test.py
@@ -75,8 +75,9 @@ def test_install_int2lm_3_00_nvhpc():
     spack_install('int2lm @int2lm-3.00 %nvhpc', test_root=False)
 
 
-def test_install_libcdi_pio_default():
-    spack_install('libcdi-pio')
+# This test fails because the link to scales-ppm's repo is dead.
+# def test_install_libcdi_pio_default():
+#     spack_install('libcdi-pio')
 
 
 def test_install_libgrib1_22_01_2020_nvhpc():
@@ -151,8 +152,9 @@ def test_install_py_typing_extensions_default():
     spack_install('py-typing-extensions')
 
 
-def test_install_scales_ppm_default():
-    spack_install('scales-ppm')
+# This test fails because the link to its repo is dead.
+# def test_install_default():
+#     spack_install('scales-ppm')
 
 
 def test_install_yaxt_default():

diff --git a/tools/package_overlap.py b/tools/package_overlap.py
@@ -0,0 +1,7 @@
+import os
+
+spack = set(os.listdir("./spack/var/spack/repos/builtin/packages"))
+spack_c2sm = set(os.listdir("./repos/c2sm/packages"))
+
+for folder in sorted(spack & spack_c2sm):
+    print(folder)