Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.7.15 #180

Merged
merged 4 commits into from
May 8, 2018
Merged

Conversation

jakirkham
Copy link
Member

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@jakirkham
Copy link
Member Author

@conda-forge-admin, please re-render.

@jakirkham
Copy link
Member Author

jakirkham commented May 7, 2018

Hmm...did some Python 3 code sneak into the Python 2 codebase on Windows. ;)

C:\bld\python_1525666272216\work\Lib\xml\sax\__init__.py
1994 File(s) copied
        1 file(s) moved.
        1 dir(s) moved.
        1 file(s) moved.
        1 dir(s) moved.
Compiling C:\bld\python_1525666272216\_h_env\Lib\tkinter\ttk.py ...
  File "C:\bld\python_1525666272216\_h_env\Lib\tkinter\ttk.py", line 83
    for *state, val in items:
        ^
SyntaxError: invalid syntax

ref: https://ci.appveyor.com/project/conda-forge/python-feedstock/build/1.0.334 (added link in edit)

@jjhelmus
Copy link
Contributor

jjhelmus commented May 7, 2018

did some Python 3 code sneak into the Python 2 codebase on Windows

This file was included in python/cpython#6326 to close bpo 33906. I haven't had time to dig deep enough to know if this new file is required for the fix or not.

For defaults we skipped byte compiling this file by adding it to the compileall.py regex.

@jakirkham
Copy link
Member Author

Thanks @jjhelmus.

Have added a comment upstream. Let's see what they say.

@jakirkham
Copy link
Member Author

Sounds like we can just drop them. ( python/cpython#6724 )

These files snuck into a bug fix patch, but appear to not be needed
after all based on information from upstream. So this applies an
upstream patch to just drop them.
@@ -15,8 +15,10 @@ source:
- win-library_bin.patch # [win]
- 0008-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch
- 0017-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
- PR_6724.patch
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generated from PR ( python/cpython#6724 )'s only commit ( python/cpython@6af2231 ).

@jjhelmus
Copy link
Contributor

jjhelmus commented May 8, 2018

LGTM, thanks for the update @jakirkham

@jjhelmus jjhelmus merged commit 89a2ca5 into conda-forge:2.7 May 8, 2018
@jakirkham jakirkham deleted the release_2.7.15 branch May 8, 2018 15:32
@jakirkham
Copy link
Member Author

Thanks @jjhelmus :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants