From 3314ac734ee36a298481484712c22a20e05bcf13 Mon Sep 17 00:00:00 2001 From: Alex Earl Date: Sat, 22 Oct 2016 04:17:22 -0700 Subject: [PATCH] 2.7.7 RC1 --- CurrentVersion.props | 4 ++-- Languages/IronPython/IronPython.StdLib.nuspec | 4 ++-- Languages/IronPython/IronPython.nuspec | 4 ++-- Languages/IronPython/Scripts/test_parrot.py | 4 ++-- Package/msi/Python/IronPython.Installer.wixproj | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CurrentVersion.props b/CurrentVersion.props index 65e825e274..e9f1258aa7 100644 --- a/CurrentVersion.props +++ b/CurrentVersion.props @@ -6,7 +6,7 @@ 7 candidate - 0 + 1 0 @@ -16,7 +16,7 @@ 1 candidate - 0 + 1 22 diff --git a/Languages/IronPython/IronPython.StdLib.nuspec b/Languages/IronPython/IronPython.StdLib.nuspec index d650bb947d..4b88ebedb4 100644 --- a/Languages/IronPython/IronPython.StdLib.nuspec +++ b/Languages/IronPython/IronPython.StdLib.nuspec @@ -3,7 +3,7 @@ IronPython.StdLib IronPython Standard Library - 2.7.0 + 2.7.7 IronPython Contributors,Python Contributors IronPython Community http://ironpython.net @@ -14,7 +14,7 @@ en-US ironpython python dynamic dlr standard library - + diff --git a/Languages/IronPython/IronPython.nuspec b/Languages/IronPython/IronPython.nuspec index 031b0a0796..cae5666814 100644 --- a/Languages/IronPython/IronPython.nuspec +++ b/Languages/IronPython/IronPython.nuspec @@ -3,7 +3,7 @@ IronPython IronPython - 2.7.0 + 2.7.7 IronPython Contributors,Microsoft IronPython Community http://ironpython.net @@ -14,7 +14,7 @@ en-US ironpython python dynamic dlr - + diff --git a/Languages/IronPython/Scripts/test_parrot.py b/Languages/IronPython/Scripts/test_parrot.py index b827da5eae..6e69e2c0bb 100644 --- a/Languages/IronPython/Scripts/test_parrot.py +++ b/Languages/IronPython/Scripts/test_parrot.py @@ -19,8 +19,8 @@ """ from time import clock -import sys, nt -sys.path.append([nt.environ[x] for x in nt.environ.keys() if x.lower() == "dlr_root"][0] + "\\Languages\\IronPython\\External\\parrotbench") +import sys, os +sys.path.append(os.path.join([os.environ[x] for x in os.environ.keys() if x.lower() == "dlr_root"][0], "Languages", "IronPython", "External", "parrotbench")) if sys.platform=="cli": import System is_cli64 = System.IntPtr.Size == 8 diff --git a/Package/msi/Python/IronPython.Installer.wixproj b/Package/msi/Python/IronPython.Installer.wixproj index c72332ce7c..ce7f8432de 100644 --- a/Package/msi/Python/IronPython.Installer.wixproj +++ b/Package/msi/Python/IronPython.Installer.wixproj @@ -1,6 +1,6 @@  - + Debug x86