Remove deprecated spack schemas

GoogleCloudPlatform · May 24, 2024 · 7de4373 · 7de4373
1 parent 21f1f3e
commit 7de4373
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 21 deletions.
diff --git a/lib/ramble/docs/dev_guides/application_dev_guide.rst b/lib/ramble/docs/dev_guides/application_dev_guide.rst
@@ -265,6 +265,7 @@ directives that are intended to be package manager specific. As an example,
 there are directives for Spack defined by:
 
 * :meth:`ramble.language.shared_language.software_spec`
+* :meth:`ramble.language.shared_language.define_compiler`
 * :meth:`ramble.language.shared_language.required_package`
 
 These provide Ramble with information about how Spack could install and require

diff --git a/lib/ramble/ramble/schema/spack.py b/lib/ramble/ramble/schema/spack.py
@@ -12,21 +12,12 @@
    :lines: 12-
 """  # noqa E501
 
-import ramble.schema.variables
-import ramble.schema.applications
-import ramble.schema.zips
 
 #: Properties for inclusion in other schemas
 properties = {
     'spack': {
         'type': 'object',
         'properties': {
-            'concretized': {
-                'type': 'boolean',
-                'default': None
-            },
-            'variables': ramble.schema.variables.variables_def,
-            'zips': ramble.schema.zips.zips_def,
             'packages': {
                 'type': 'object',
                 'additionalProperties': {
@@ -41,11 +32,6 @@
                             'type': 'string',
                             'default': None,
                         },
-                        'variables': ramble.schema.variables.variables_def,
-                        'zips': ramble.schema.zips.zips_def,
-                        'matrix': ramble.schema.applications.matrix_def,
-                        'matrices': ramble.schema.applications.matrices_def,
-                        'exclude': ramble.schema.applications.exclude_def,
                     },
                     'additionalProperties': False,
                     'default': {}
@@ -67,11 +53,6 @@
                             'items': {'type': 'string'},
                             'default': []
                         },
-                        'variables': ramble.schema.variables.variables_def,
-                        'zips': ramble.schema.zips.zips_def,
-                        'matrix': ramble.schema.applications.matrix_def,
-                        'matrices': ramble.schema.applications.matrices_def,
-                        'exclude': ramble.schema.applications.exclude_def,
                     },
                     'additionalProperties': False,
                     'default': {}

diff --git a/lib/ramble/ramble/test/cmd/workspace.py b/lib/ramble/ramble/test/cmd/workspace.py
@@ -1896,7 +1896,6 @@ def test_workspace_simplify():
               variables:
                 n_nodes: '1'
   spack:
-    concretized: true
     packages:
       zlib:
         spack_spec: zlib

diff --git a/lib/ramble/ramble/test/end_to_end/env_var_builtin.py b/lib/ramble/ramble/test/end_to_end/env_var_builtin.py
@@ -144,7 +144,6 @@ def test_env_var_from_app_only(mutable_config, mutable_mock_workspace_path, mock
               variables:
                 n_nodes: 1
   spack:
-    concretized: true
     packages: {}
     environments: {}
 """