Skip to content

Commit 8cc104c

Browse files
committed
Add a python 3.8 compliant way to combine dicts in distribution tests
1 parent 0482c47 commit 8cc104c

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tests/test_distribution.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,9 @@ def test_DistributionPackager_filter_exclude_configs_with_excludes_config_and_fi
430430
manifest = os.path.join(root, "environment", "spack.yaml")
431431
extra_data = {"packages": {"gcc": {"require": ["@1.2.3"]}}}
432432
extra_data_2 = {"env_vars": {"set": {"TEST_ENV_VARS": "123456"}}}
433-
create_spack_manifest(manifest, extra_data=(extra_data | extra_data_2))
433+
combined_data = extra_data.copy()
434+
combined_data.update(extra_data_2)
435+
create_spack_manifest(manifest, extra_data=combined_data)
434436
env_dir = os.path.dirname(manifest)
435437
env = get_fake_concretize_env(env_dir)
436438

0 commit comments

Comments
 (0)