Refine gt4py and icon4py

repo/packages/py-gt4py/package.py

@@ -12,13 +12,13 @@ class PyGt4py(PythonPackage):
     domain-specific language (DSL). """
 
     homepage = "https://gridtools.github.io/gt4py/latest/index.html"
-
+    git = "[email protected]:GridTools/gt4py.git"
     url = "[email protected]:GridTools/gt4py.git"
 
     version('main', branch='main', git=url)
-    version('1.0.3.3', tag='icon4py_20240229', git=url)
-    version('1.0.3.7', tag='icon4py_20240521', git=url)
-    version('1.0.3.8', tag='icon4py_20240711', git=url)
+    version('1.0.3.8', tag='icon4py_20240711')
+    version('1.0.3.5', tag='icon4py_20240322')
+    version('1.0.3.3', tag='icon4py_20240229')
 
     maintainers = ['samkellerhals']
 

repo/packages/py-icon4py/package.py

@@ -16,17 +16,14 @@ class PyIcon4py(PythonPackage):
     """ICON4Py contains Python (GT4Py) implementations of ICON (inspired) 
     components for weather and climate models."""
 
-    url = "[email protected]:C2SM/icon4py.git"
     git = '[email protected]:C2SM/icon4py.git'
-
     homepage = "https://github.com/C2SM/icon4py"
-
     maintainers = ['agopal', 'samkellerhals']
 
-    version('main', branch='main', git=git)
-    version('0.0.10', tag='v0.0.10', git=git)
-    version('0.0.11', tag='v0.0.11', git=git)
-    version('0.0.12', tag='v0.0.12', git=git)
+    version('main', branch='main')
+    version('0.0.12', tag='v0.0.12')
+    version('0.0.11', tag='v0.0.11')
+    version('0.0.10', tag='v0.0.10')
 
     depends_on('py-wheel', type='build')
     depends_on('py-setuptools', type='build')

test/system_test.py

@@ -16,7 +16,7 @@ def test_install_cosmo_eccodes_definitions_version(version):
 
 
 def test_install_cosmo_6_0():
-    spack_install('[email protected]%nvhpc', test_root=False)
+    spack_install('cosmo @6.0 %nvhpc', test_root=False)
 
 
 def test_install_eccodes_2_19_0():
@@ -73,23 +73,16 @@ def test_install_icontools():
 
 
 @pytest.mark.int2lm
-def test_install_int2ml_version_3_00_gcc():
-    spack_install('int2lm @int2lm-3.00 %gcc', test_root=False)
-
-
-@pytest.mark.int2lm
-def test_install_int2lm_version_3_00_nvhpc_fixed_definitions():
-    spack_install(
-        'int2lm @int2lm-3.00 %nvhpc ^[email protected]%nvhpc',
-        test_root=False)
+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')
 
 
 def test_install_libgrib1_22_01_2020_nvhpc():
-    spack_install('libgrib1 @22-01-2020%nvhpc')
+    spack_install('libgrib1 @22-01-2020 %nvhpc')
 
 
 def test_install_makedepf90():
@@ -111,42 +104,34 @@ def test_install_pytorch_fortran_proxy_version_0_4():
                   test_root=False)
 
 
-def test_py_cytoolz_install_default():
+def test_install_py_cytoolz_install_default():
     spack_install('py-cytoolz')
 
 
-def test_py_devtools_install_default():
+def test_install_py_devtools_install_default():
     spack_install('py-devtools')
 
 
-def test_py_factory_boy_install_default():
+def test_install_py_factory_boy_install_default():
     spack_install('py-factory-boy')
 
 
-def test_py_frozendict_install_default():
+def test_install_py_frozendict_install_default():
     spack_install('py-frozendict')
 
 
-def test_py_gridtools_cpp_install_default():
+def test_install_py_gridtools_cpp_install_default():
     spack_install('py-gridtools-cpp')
 
 
-@pytest.mark.parametrize("version", ['1.0.3.3', '1.0.3.7', '1.0.3.8'])
+@pytest.mark.parametrize("version", ['1.0.3.3', '1.0.3.5', '1.0.3.8'])
 def test_install_py_gt4py_for_version(version, ):
     spack_install(f'py-gt4py @{version}')
 
 
-@pytest.mark.py_icon4py
-def test_install_py_icon4py_version_0_0_10():
-    spack_install('py-icon4py @ 0.0.10 %gcc ^[email protected]')
-
-
-def test_install_py_icon4py_version_0_0_11():
-    spack_install('py-icon4py @ 0.0.11 %gcc ^[email protected]')
-
-
-def test_install_py_icon4py_version_0_0_12():
-    spack_install('py-icon4py @ 0.0.12 %gcc ^[email protected]')
+@pytest.mark.parametrize("version", ['0.0.10', '0.0.11', '0.0.12'])
+def test_install_py_icon4py_version_0_0_10(version, ):
+    spack_install(f'py-icon4py @{version}')
 
 
 def test_install_py_hatchling_default():