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.

Sign up for GitHub

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

Jump to bottom

Various Python 3.5 fixes #51

Merged
merged 7 commits into from
Jul 26, 2016
Merged

Various Python 3.5 fixes #51

merged 7 commits into from
Jul 26, 2016

Conversation

jjhelmus
Copy link
Contributor

Makes python 3.5 recipe similar to recipe in anaconda-recipes

jjhelmus added 5 commits July 23, 2016 08:17
@jjhelmus
Add vs2015_runtime as run requirement
31da547 
closes conda-forge#47
@jjhelmus
Apply patch to include Library/bin in path on win
4baf08d 
patch file sourced from ContinuumIO/anaconda-recipes
@jjhelmus
Apply patch to adjust executable finding on win
08a78e5 
patch sourced from ContinuumIO/anaconda-recipes
@jjhelmus
Apply patch to adjust osx ld flags
6a2cd6a 
patch sourced from ContinuumIO/anaconda-recipe
@jjhelmus
Adjust no_link files in recipe
6c97f4f 
section now matches that in ContinuumIO/anaconda-recipes
@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.

@ocefpaf
Copy link
Member

ocefpaf commented Jul 23, 2016

@jjhelmus I got my hands on a Win64 machine for the weekend. Let me know if you need help testing things.

@jjhelmus
Copy link
Contributor Author

Apparently the patches in anaconda-recipes are not always valid. Will need to make my own.

@ocefpaf
Copy link
Member

ocefpaf commented Jul 23, 2016

Apparently the patches in anaconda-recipes are not always valid. Will need to make my own.

I guess we should start packaging (and using) quilt to manage these.

jjhelmus added 2 commits July 23, 2016 09:25
@jjhelmus
Update win-library_bin.patch
34b36f9 
Make a new version of win-library_bin.patch from Python sources
@jjhelmus
Rerender feedstock
b258306
@jjhelmus
Copy link
Contributor Author

The patch problem is not really the fault of anaconda-recipes as they are applying an additional patch to site.py which when these two patches are applied in the correct order resolves fine. We don't want the site.patch patch from anaconda-recipes so regeneration of the other patch was needed.

jakirkham
jakirkham reviewed Jul 23, 2016
View reviewed changes
recipe/meta.yaml
@@ -8,14 +8,17 @@ source:
sha256: 1524b840e42cf3b909e8f8df67c1724012c7dc7f9d076d4feef2d3eff031e8a0
patches:
- omit-local-site-packages.patch # [osx]
- osx64-dist.patch # [osx and x86_64]
Copy link
Member

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.

Copy link
Contributor Author

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-forge the x86_64 tag is not needed but adding it makes the recipe match better with the one in anaconda-recipes.

@jjhelmus
Copy link
Contributor Author

Any other comments on this issue? I was planning on merging this later today unless there is a show stopper.

I'll submit a similar update to Python 3.4 shortly.

jakirkham
jakirkham reviewed Jul 24, 2016
View reviewed changes
recipe/meta.yaml
- DLLs/_ctypes.py # [win]
- bin/python
- DLLs/_ctypes.pyd # [win]
- bin/python3.5 # [unix]
Copy link
Member

Choose a reason for hiding this comment

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

What's going on with this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

@jjhelmus jjhelmus mentioned this pull request Jul 25, 2016
Merged
@jakirkham jakirkham mentioned this pull request Jul 25, 2016
Closed
@jjhelmus
Copy link
Contributor Author

Is this good to go?

@jakirkham
Copy link
Member

Fine by me. Should we have someone look over the Windows stuff? I'm still fumbling in that area so might not be the best reviewer for that.

@jakirkham jakirkham mentioned this pull request Jul 25, 2016
Closed
@msarahan msarahan merged commit ef6fe0f into conda-forge:master Jul 26, 2016
@msarahan
Copy link
Member

Thanks @jjhelmus

@jakirkham jakirkham mentioned this pull request Jul 26, 2016
Merged
jjhelmus pushed a commit to jjhelmus/python-feedstock that referenced this pull request Jun 6, 2024
@katietz
Merge pull request conda-forge#51 from AnacondaRecipes/update-regex-t…
4db0b22 
…unearch

add fix for regex for mtune/march
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jjhelmus @conda-forge-linter @ocefpaf @jakirkham @msarahan @jrevans