Merge pull request #236 from paweljasinski/cp35683

removed annoying error during pip install - cp35683
IronLanguages · Dec 1, 2014 · e6d4b28 · e6d4b28
2 parents 259adf7 + 89a723b
commit e6d4b28
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/..._RESTRICTED/Languages/IronPython/27/Lib/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl b/..._RESTRICTED/Languages/IronPython/27/Lib/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
diff --git a/...RICTED/Languages/IronPython/27/Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl b/...RICTED/Languages/IronPython/27/Lib/ensurepip/_bundled/setuptools-3.6-py2.py3-none-any.whl
diff --git a/External.LCA_RESTRICTED/Languages/IronPython/repackage/pip/pip/req.py b/External.LCA_RESTRICTED/Languages/IronPython/repackage/pip/pip/req.py
@@ -310,6 +310,9 @@ def run_egg_info(self, force_root_egg_info=False):
             script = script.replace('__SETUP_PY__', repr(self.setup_py))
             script = script.replace('__PKG_NAME__', repr(self.name))
             egg_info_cmd = [sys.executable, '-c', script, 'egg_info']
+            if sys.platform == 'cli':
+                egg_info_cmd.insert(1, "-X:Frames")
+
             # We can't put the .egg-info files at the root, because then the source code will be mistaken
             # for an installed egg, causing problems
             if self.editable or force_root_egg_info:
@@ -677,6 +680,8 @@ def install(self, install_options, global_options=(), root=None):
         record_filename = os.path.join(temp_location, 'install-record.txt')
         try:
             install_args = [sys.executable]
+            if sys.platform == 'cli':
+                install_args.append('-X:Frames')
             install_args.append('-c')
             install_args.append(
             "import setuptools, tokenize;__file__=%r;"\