Skip to content

Commit 7de4373

Browse files
committed
Remove deprecated spack schemas
1 parent 21f1f3e commit 7de4373

File tree

4 files changed

+1
-21
lines changed

4 files changed

+1
-21
lines changed

lib/ramble/docs/dev_guides/application_dev_guide.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ directives that are intended to be package manager specific. As an example,
265265
there are directives for Spack defined by:
266266

267267
* :meth:`ramble.language.shared_language.software_spec`
268+
* :meth:`ramble.language.shared_language.define_compiler`
268269
* :meth:`ramble.language.shared_language.required_package`
269270

270271
These provide Ramble with information about how Spack could install and require

lib/ramble/ramble/schema/spack.py

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,12 @@
1212
:lines: 12-
1313
""" # noqa E501
1414

15-
import ramble.schema.variables
16-
import ramble.schema.applications
17-
import ramble.schema.zips
1815

1916
#: Properties for inclusion in other schemas
2017
properties = {
2118
'spack': {
2219
'type': 'object',
2320
'properties': {
24-
'concretized': {
25-
'type': 'boolean',
26-
'default': None
27-
},
28-
'variables': ramble.schema.variables.variables_def,
29-
'zips': ramble.schema.zips.zips_def,
3021
'packages': {
3122
'type': 'object',
3223
'additionalProperties': {
@@ -41,11 +32,6 @@
4132
'type': 'string',
4233
'default': None,
4334
},
44-
'variables': ramble.schema.variables.variables_def,
45-
'zips': ramble.schema.zips.zips_def,
46-
'matrix': ramble.schema.applications.matrix_def,
47-
'matrices': ramble.schema.applications.matrices_def,
48-
'exclude': ramble.schema.applications.exclude_def,
4935
},
5036
'additionalProperties': False,
5137
'default': {}
@@ -67,11 +53,6 @@
6753
'items': {'type': 'string'},
6854
'default': []
6955
},
70-
'variables': ramble.schema.variables.variables_def,
71-
'zips': ramble.schema.zips.zips_def,
72-
'matrix': ramble.schema.applications.matrix_def,
73-
'matrices': ramble.schema.applications.matrices_def,
74-
'exclude': ramble.schema.applications.exclude_def,
7556
},
7657
'additionalProperties': False,
7758
'default': {}

lib/ramble/ramble/test/cmd/workspace.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,6 @@ def test_workspace_simplify():
18961896
variables:
18971897
n_nodes: '1'
18981898
spack:
1899-
concretized: true
19001899
packages:
19011900
zlib:
19021901
spack_spec: zlib

lib/ramble/ramble/test/end_to_end/env_var_builtin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ def test_env_var_from_app_only(mutable_config, mutable_mock_workspace_path, mock
144144
variables:
145145
n_nodes: 1
146146
spack:
147-
concretized: true
148147
packages: {}
149148
environments: {}
150149
"""

0 commit comments

Comments
 (0)