From 486e13a3760e52d3a877fcb720320a0115b9630d Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sat, 10 Feb 2018 17:39:57 -0500 Subject: 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 0b6c016..c053edf 100644 --- a/src/engine/SCons/compat/__init__.py +++ b/src/engine/SCons/compat/__init__.py @@ -98,7 +98,7 @@ import pickle # 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. -- cgit v0.12 From 014b0bf4a0ba87a3a7ec1ebce2f9ae81ae8e5d86 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sat, 10 Feb 2018 23:40:58 -0500 Subject: Updated CHANGES.txt --- src/CHANGES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index d2587e3..de06e84 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 -- cgit v0.12 From 3d65c6d31d19ab9d439413b89efa083c6d887542 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sun, 11 Feb 2018 17:20:36 -0500 Subject: forcing passing of python 3.5 and 3.6 tests for successful build in travis CI --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b6049a..bdb3baa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ install: # so allow failure so the coverage stage can be reached with python 2 matrix: allow_failures: - - python: 3.5 - - python: 3.6 - python: pypy -- cgit v0.12 From da0a0c9a2de08fcfb5b0a0b4df30d21c4c786045 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sun, 11 Feb 2018 17:22:41 -0500 Subject: updated comments no functional change --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdb3baa..0e02b41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,7 @@ language: python install: - ./.travis/install.sh -# python 3 is not fulling passing at this time -# so allow failure so the coverage stage can be reached with python 2 +# pypy is not passing, but allow failures for coverage stage to be reached matrix: allow_failures: - python: pypy -- cgit v0.12 From 5af439a4cab5a55b43fce75118eccbd45bf82fe5 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Sun, 11 Feb 2018 21:02:30 -0500 Subject: used pickle.HIGHEST_PROTOCAL instead of -2 for better readability --- 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 c053edf..7ab94c5 100644 --- a/src/engine/SCons/compat/__init__.py +++ b/src/engine/SCons/compat/__init__.py @@ -98,7 +98,7 @@ import pickle # Was pickle.HIGHEST_PROTOCOL # Changed to 2 so py3.5+'s pickle will be compatible with py2.7. -PICKLE_PROTOCOL = -2 +PICKLE_PROTOCOL = pickle.HIGHEST_PROTOCOL # TODO: FIXME # In 3.x, 'profile' automatically loads the fast version if available. -- cgit v0.12 From 0589244884a657553258addd579fe0f592238b96 Mon Sep 17 00:00:00 2001 From: Daniel Moody Date: Mon, 12 Feb 2018 08:45:52 -0500 Subject: updated changes to make note that increasing the pickling protocal will cause issues when reading sconsigns with the previous pickle protocal --- src/CHANGES.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index de06e84..62c6aa7 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,9 +8,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 - + - Set the pickling protocal back to highest which was causing issues + with variant dir tests. This will cause issues if reading sconsigns + pickled with the previous lower protocal. + 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 -- cgit v0.12