Various Python 3.5 fixes #51
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,14 +8,17 @@ source: | |
| sha256: 1524b840e42cf3b909e8f8df67c1724012c7dc7f9d076d4feef2d3eff031e8a0 | ||
| patches: | ||
| - omit-local-site-packages.patch # [osx] | ||
| - osx64-dist.patch # [osx and x86_64] | ||
| - win-find_exe.patch # [win] | ||
| - win-library_bin.patch # [win] | ||
|
|
||
| build: | ||
| number: 2 | ||
| # Windows has issues updating python if conda is using files itself. | ||
| # Copy rather than link. | ||
| no_link: | ||
| - DLLs/_ctypes.pyd # [win] | ||
| - bin/python3.5 # [unix] | ||
|
There was a problem hiding this comment. Both of those lines were taken from the python 3.5 recipe on anaconda-recipes bin/python is a symbolic link to bin/python3.5 so it makes more sense to not link the true file as opposed to the symbolic link. DLLs/_ctypes.py does not exist and it should be _ctypes.pyd, just a typo in the original recipe that was never caught. I believe it must be because of the comment above in the souce. |
||
| track_features: | ||
| - vc14 # [win] | ||
|
|
||
|
|
@@ -37,6 +40,7 @@ requirements: | |
| - xz 5.2.* # [unix] | ||
| - zlib 1.2.* # [unix] | ||
| - ncurses 5.9* # [linux] | ||
| - vs2015_runtime # [win] | ||
|
|
||
| test: | ||
| commands: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git Lib/distutils/unixccompiler.py Lib/distutils/unixccompiler.py | ||
| index 094a2f0..4252605 100644 | ||
| --- Lib/distutils/unixccompiler.py | ||
| +++ Lib/distutils/unixccompiler.py | ||
| @@ -191,6 +191,7 @@ class UnixCCompiler(CCompiler): | ||
| linker[i] = self.compiler_cxx[i] | ||
|
|
||
| if sys.platform == 'darwin': | ||
| + ld_args = ['-arch', 'x86_64'] + ld_args | ||
| linker = _osx_support.compiler_fixup(linker, ld_args) | ||
|
|
||
| self.spawn(linker + ld_args) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| diff --git Lib/distutils/spawn.py Lib/distutils/spawn.py | ||
| index 5dd415a..ce85901 100644 | ||
| --- Lib/distutils/spawn.py | ||
| +++ Lib/distutils/spawn.py | ||
| @@ -176,17 +176,16 @@ def find_executable(executable, path=None): | ||
| path = os.environ['PATH'] | ||
|
|
||
| paths = path.split(os.pathsep) | ||
| - base, ext = os.path.splitext(executable) | ||
| - | ||
| - if (sys.platform == 'win32') and (ext != '.exe'): | ||
| - executable = executable + '.exe' | ||
| - | ||
| - if not os.path.isfile(executable): | ||
| - for p in paths: | ||
| - f = os.path.join(p, executable) | ||
| - if os.path.isfile(f): | ||
| - # the file exists, we have a shot at spawn working | ||
| - return f | ||
| - return None | ||
| - else: | ||
| - return executable | ||
| + | ||
| + for ext in '.exe', '.bat', '': | ||
| + newexe = executable + ext | ||
| + | ||
| + if os.path.isfile(newexe): | ||
| + return newexe | ||
| + else: | ||
| + for p in paths: | ||
| + f = os.path.join(p, newexe) | ||
| + if os.path.isfile(f): | ||
| + # the file exists, we have a shot at spawn working | ||
| + return f | ||
| + return None |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| --- Lib/site.py.orig 2016-07-23 09:17:55.000000000 -0500 | ||
| +++ Lib/site.py 2016-07-23 09:25:06.000000000 -0500 | ||
| @@ -556,6 +556,9 @@ | ||
| execsitecustomize() | ||
| if ENABLE_USER_SITE: | ||
| execusercustomize() | ||
| + if sys.platform == 'win32': | ||
| + os.environ["PATH"] = r"%s\Library\bin;%s" % (sys.prefix, | ||
| + os.environ["PATH"]) | ||
|
|
||
| # Prevent edition of sys.path when python was started with -S and | ||
| # site is imported later. |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Though I don't think OS X 32-bit has been supported for a bit. I don't have any problem with adding
x86_64.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, for use in
conda-forgethex86_64tag is not needed but adding it makes the recipe match better with the one inanaconda-recipes.