From 486e13a3760e52d3a877fcb720320a0115b9630d Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sat, 10 Feb 2018 17:39:57 -0500 Subject: [PATCH 1/2] pickle protocal was causing issues in some cases --- src/engine/SCons/compat/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/SCons/compat/__init__.py b/src/engine/SCons/compat/__init__.py index 0b6c016a17..c053edf563 100644 --- a/src/engine/SCons/compat/__init__.py +++ b/src/engine/SCons/compat/__init__.py @@ -98,7 +98,7 @@ def rename_module(new, old): # Was pickle.HIGHEST_PROTOCOL # Changed to 2 so py3.5+'s pickle will be compatible with py2.7. -PICKLE_PROTOCOL = 2 +PICKLE_PROTOCOL = -2 # TODO: FIXME # In 3.x, 'profile' automatically loads the fast version if available. From 014b0bf4a0ba87a3a7ec1ebce2f9ae81ae8e5d86 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sat, 10 Feb 2018 23:40:58 -0500 Subject: [PATCH 2/2] Updated CHANGES.txt --- src/CHANGES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index d2587e32d7..de06e84842 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -7,6 +7,10 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE + From Daniel Moody: + - Made a small change to scons main __init__.py to set the pickling protocal + to choose the latest which fixed 2 failing test varient dir test from Interactive + From Ray Donnelly: - Fix the PATH created by scons.bat (and other .bat files) to provide a normalized PATH. Some pythons in the 3.6 series are no longer able to handle paths which