Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix key error on getting the "testing" key on older contexts #1863

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions src/rez/data/tests/contexts/resolved_context-4.8.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"append_sys_path": true,
"arch": "x86_64",
"building": false,
"caching": false,
"created": 1729961872,
"default_patch_lock": "no_lock",
"failure_description": null,
"from_cache": false,
"graph": "{'nodes': [((('fillcolor', '#FFFFAA'), ('fontsize', 10), ('style', 'filled,dashed')), [('_1', 'hello_world')]), ((('fillcolor', '#AAFFAA'), ('fontsize', 10), ('style', 'filled')), [('_2', 'hello_world-1.0[]')])], 'edges': [((('arrowsize', '0.5'),), [('_1', '_2')])]}",
"host": "arch01",
"implicit_packages": [],
"load_time": 0.0,
"num_loaded_packages": 1,
"os": "arch",
"package_cache_async": true,
"package_caching": true,
"package_filter": [],
"package_orderers": null,
"package_paths": [
"/tmp/rez_selftest_ec71iu0a/packages"
],
"package_requests": [
"hello_world"
],
"parent_suite_path": null,
"patch_locks": {},
"platform": "linux",
"requested_timestamp": null,
"resolved_ephemerals": [],
"resolved_packages": [
{
"key": "filesystem.variant",
"variables": {
"index": null,
"location": "/tmp/rez_selftest_ec71iu0a/packages",
"name": "hello_world",
"repository_type": "filesystem",
"version": "1.0"
}
}
],
"rez_path": "/home/jcmorin/jcmenv/aswf/rez/src/rez",
"rez_version": "3.1.1",
"serialize_version": "4.8",
"solve_time": 0.00042057037353515625,
"status": "solved",
"suite_context_name": null,
"timestamp": 1729961872,
"user": "jcmorin"
}
6 changes: 4 additions & 2 deletions src/rez/resolved_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class ResolvedContext(object):
command within a configured python namespace, without spawning a child
shell.
"""
serialize_version = (4, 8)
serialize_version = (4, 9)
JeanChristopheMorinPerso marked this conversation as resolved.
Show resolved Hide resolved
tmpdir_manager = TempDirs(config.context_tmpdir, prefix="rez_context_")
context_tracking_payload = None
context_tracking_lock = threading.Lock()
Expand Down Expand Up @@ -1630,7 +1630,6 @@ def _print_version(value):

r.timestamp = d["timestamp"]
r.building = d["building"]
r.testing = d["testing"]
r.caching = d["caching"]
r.implicit_packages = [PackageRequest(x) for x in d["implicit_packages"]]
r._package_requests = [PackageRequest(x) for x in d["package_requests"]]
Expand Down Expand Up @@ -1725,6 +1724,9 @@ def _print_version(value):

r.package_cache_async = d.get("package_cache_async", True)

# -- SINCE SERIALIZE 4.9
r.testing = d.get("testing", False)

# <END SERIALIZATION>

# track context usage
Expand Down
8 changes: 8 additions & 0 deletions src/rez/tests/test_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,14 @@ def test_serialize(self):
env = r2.get_environ()
self.assertEqual(env.get("OH_HAI_WORLD"), "hello")

def test_deserialize_older_versions(self):
"""Test deserialization of older contexts."""
baked_contexts_path = self.data_path("contexts")

for context_file in os.listdir(baked_contexts_path):
# load
_ = ResolvedContext.load(os.path.join(baked_contexts_path, context_file))

def test_retarget(self):
"""Test that a retargeted context behaves identically."""
self.inject_python_repo()
Expand Down
Loading