Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
602dc92b
Commit
602dc92b
authored
Sep 09, 2016
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix msvc monkeypatching, revealed by Appveyor tests. Fixes #778.
parent
a3439018
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
CHANGES.rst
CHANGES.rst
+5
-0
setuptools/monkey.py
setuptools/monkey.py
+5
-4
No files found.
CHANGES.rst
View file @
602dc92b
...
...
@@ -2,6 +2,11 @@
CHANGES
=======
v27
.1.1
-------
*
#
778
:
Fix
MSVC
monkeypatching
.
v27
.1.0
-------
...
...
setuptools/monkey.py
View file @
602dc92b
...
...
@@ -7,6 +7,7 @@ import distutils.filelist
import
platform
import
setuptools
from
.
import
msvc
__all__
=
[]
...
...
@@ -134,22 +135,22 @@ def patch_for_msvc_specialized_compiler():
try
:
# Patch distutils.msvc9compiler
unpatched
[
'msvc9_find_vcvarsall'
]
=
msvc9compiler
.
find_vcvarsall
msvc9compiler
.
find_vcvarsall
=
msvc9_find_vcvarsall
msvc9compiler
.
find_vcvarsall
=
msvc
.
msvc
9_find_vcvarsall
unpatched
[
'msvc9_query_vcvarsall'
]
=
msvc9compiler
.
query_vcvarsall
msvc9compiler
.
query_vcvarsall
=
msvc9_query_vcvarsall
msvc9compiler
.
query_vcvarsall
=
msvc
.
msvc
9_query_vcvarsall
except
NameError
:
pass
try
:
# Patch distutils._msvccompiler._get_vc_env
unpatched
[
'msvc14_get_vc_env'
]
=
msvc14compiler
.
_get_vc_env
msvc14compiler
.
_get_vc_env
=
msvc14_get_vc_env
msvc14compiler
.
_get_vc_env
=
msvc
.
msvc
14_get_vc_env
except
NameError
:
pass
try
:
# Patch distutils._msvccompiler.gen_lib_options for Numpy
unpatched
[
'msvc14_gen_lib_options'
]
=
msvc14compiler
.
gen_lib_options
msvc14compiler
.
gen_lib_options
=
msvc14_gen_lib_options
msvc14compiler
.
gen_lib_options
=
msvc
.
msvc
14_gen_lib_options
except
NameError
:
pass
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment