modules: remove deprecated code and test data (#40966)
This removes a few deprecated attributes from the schema of the "modules" section. Test data for deprecated options is removed as well.
This commit is contained in:
		 Massimiliano Culpo
					Massimiliano Culpo
				
			
				
					committed by
					
						 GitHub
						GitHub
					
				
			
			
				
	
			
			
			 GitHub
						GitHub
					
				
			
						parent
						
							3405fe60f1
						
					
				
				
					commit
					26d6bfbb7f
				
			| @@ -18,9 +18,7 @@ | ||||
| #: IS ADDED IMMEDIATELY BELOW THE MODULE TYPE ATTRIBUTE | ||||
| spec_regex = ( | ||||
|     r"(?!hierarchy|core_specs|verbose|hash_length|defaults|filter_hierarchy_specs|hide|" | ||||
|     r"whitelist|blacklist|"  # DEPRECATED: remove in 0.20. | ||||
|     r"include|exclude|"  # use these more inclusive/consistent options | ||||
|     r"projections|naming_scheme|core_compilers|all)(^\w[\w-]*)" | ||||
|     r"include|exclude|projections|naming_scheme|core_compilers|all)(^\w[\w-]*)" | ||||
| ) | ||||
| 
 | ||||
| #: Matches a valid name for a module set | ||||
| @@ -46,14 +44,7 @@ | ||||
|             "default": {}, | ||||
|             "additionalProperties": False, | ||||
|             "properties": { | ||||
|                 # DEPRECATED: remove in 0.20. | ||||
|                 "environment_blacklist": { | ||||
|                     "type": "array", | ||||
|                     "default": [], | ||||
|                     "items": {"type": "string"}, | ||||
|                 }, | ||||
|                 # use exclude_env_vars instead | ||||
|                 "exclude_env_vars": {"type": "array", "default": [], "items": {"type": "string"}}, | ||||
|                 "exclude_env_vars": {"type": "array", "default": [], "items": {"type": "string"}} | ||||
|             }, | ||||
|         }, | ||||
|         "template": {"type": "string"}, | ||||
| @@ -80,11 +71,6 @@ | ||||
|             "properties": { | ||||
|                 "verbose": {"type": "boolean", "default": False}, | ||||
|                 "hash_length": {"type": "integer", "minimum": 0, "default": 7}, | ||||
|                 # DEPRECATED: remove in 0.20. | ||||
|                 "whitelist": array_of_strings, | ||||
|                 "blacklist": array_of_strings, | ||||
|                 "blacklist_implicits": {"type": "boolean", "default": False}, | ||||
|                 # whitelist/blacklist have been replaced with include/exclude | ||||
|                 "include": array_of_strings, | ||||
|                 "exclude": array_of_strings, | ||||
|                 "exclude_implicits": {"type": "boolean", "default": False}, | ||||
|   | ||||
| @@ -1,14 +0,0 @@ | ||||
| # DEPRECATED: remove this in v0.20 | ||||
| # See `exclude.yaml` for the new syntax | ||||
| enable: | ||||
|   - lmod | ||||
| lmod: | ||||
|   core_compilers: | ||||
|     - 'clang@3.3' | ||||
|   hierarchy: | ||||
|     - mpi | ||||
|   blacklist: | ||||
|     - callpath | ||||
|  | ||||
|   all: | ||||
|     autoload: direct | ||||
| @@ -1,30 +0,0 @@ | ||||
| # DEPRECATED: remove this in v0.20 | ||||
| # See `alter_environment.yaml` for the new syntax | ||||
| enable: | ||||
|   - lmod | ||||
| lmod: | ||||
|   core_compilers: | ||||
|     - 'clang@3.3' | ||||
|  | ||||
|   hierarchy: | ||||
|     - mpi | ||||
|  | ||||
|   all: | ||||
|     autoload: none | ||||
|     filter: | ||||
|       environment_blacklist: | ||||
|         - CMAKE_PREFIX_PATH | ||||
|     environment: | ||||
|       set: | ||||
|         '{name}_ROOT': '{prefix}' | ||||
|  | ||||
|   'platform=test target=x86_64': | ||||
|     environment: | ||||
|       set: | ||||
|         FOO: 'foo' | ||||
|       unset: | ||||
|         - BAR | ||||
|  | ||||
|   'platform=test target=core2': | ||||
|     load: | ||||
|       - 'foo/bar' | ||||
| @@ -1,12 +0,0 @@ | ||||
| # DEPRECATED: remove this in v0.20 | ||||
| # See `exclude.yaml` for the new syntax | ||||
| enable: | ||||
|   - tcl | ||||
| tcl: | ||||
|   whitelist: | ||||
|     - zmpi | ||||
|   blacklist: | ||||
|     - callpath | ||||
|     - mpi | ||||
|   all: | ||||
|     autoload: direct | ||||
| @@ -1,25 +0,0 @@ | ||||
| # DEPRECATED: remove this in v0.20 | ||||
| # See `alter_environment.yaml` for the new syntax | ||||
| enable: | ||||
|   - tcl | ||||
| tcl: | ||||
|   all: | ||||
|     autoload: none | ||||
|     filter: | ||||
|       environment_blacklist: | ||||
|         - CMAKE_PREFIX_PATH | ||||
|     environment: | ||||
|       set: | ||||
|         '{name}_ROOT': '{prefix}' | ||||
|  | ||||
|   'platform=test target=x86_64': | ||||
|     environment: | ||||
|       set: | ||||
|         FOO: 'foo' | ||||
|         OMPI_MCA_mpi_leave_pinned: '1' | ||||
|       unset: | ||||
|         - BAR | ||||
|  | ||||
|   'platform=test target=core2': | ||||
|     load: | ||||
|       - 'foo/bar' | ||||
| @@ -1,8 +0,0 @@ | ||||
| # DEPRECATED: remove this in v0.20 | ||||
| # See `exclude_implicits.yaml` for the new syntax | ||||
| enable: | ||||
|   - tcl | ||||
| tcl: | ||||
|   blacklist_implicits: true | ||||
|   all: | ||||
|     autoload: direct | ||||
| @@ -4,7 +4,7 @@ tcl: | ||||
|   all: | ||||
|     autoload: none | ||||
|     filter: | ||||
|       environment_blacklist: | ||||
|       exclude_env_vars: | ||||
|         - CMAKE_PREFIX_PATH | ||||
|     environment: | ||||
|       set: | ||||
|   | ||||
		Reference in New Issue
	
	Block a user