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

Version 3.5.1 #56

Merged
merged 8 commits into from
Aug 5, 2018
Merged

Version 3.5.1 #56

merged 8 commits into from
Aug 5, 2018

Conversation

dpryan79
Copy link
Contributor

@dpryan79 dpryan79 commented Aug 5, 2018

Checklist

  • Used a fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

This PR bumps the R version to 3.5.1. I had to modify patch 0011 to get this to compile properly, so someone who know whether that patch is even still relevant should have a look. The other patches have been modified to actually apply to R 3.5.1. This additionally fixes #50 going forward, though I notice that @bgruening just added a similar test to master.

@conda-forge-linter
Copy link

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

I was trying to look for recipes to lint for you, but it appears we have a merge conflict.
Please try to merge or rebase with the base branch to resolve this conflict.

Please ping the 'conda-forge/core' team (using the @ notation in a comment) if you believe this is a bug.

@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.

@dpryan79
Copy link
Contributor Author

dpryan79 commented Aug 5, 2018

This should at least build on Linux and OSX, no clue abut Windows.

@bgruening
Copy link
Contributor

bgruening commented Aug 5, 2018

Cool beans @dpryan79!

@cbrueffer @jdblischak you might want to have a look.

@ocefpaf @isuruf I guess its pretty save to merge this one. The critical part is to add 3.5.1 to https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/c47376eee20cf0b80ff1c5a16e08317de9ba362e/recipe/conda_build_config.yaml#L416 right?

@mingwandroid I have seen you released 3.5.0 for defaults, any reason why not 3.5.1? Are you ok if we proceed with 3.5.1 and pin/re-build our R stack against 3.4.1 and 3.5.1 in the future?

@isuruf
Copy link
Member

isuruf commented Aug 5, 2018

We were going to change the R layout in Windows for the new version right?

@mingwandroid
Copy link
Contributor

I need to keep defaults R aligned with MRO releases, no need for conda-forge to worry about that though.

@mingwandroid
Copy link
Contributor

Totally happy for cf to proceed with 3.5.1

@bgruening
Copy link
Contributor

@conda-forge-admin, please rerender

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-webservice.

I tried to re-render for you, but it looks like there was nothing to do.

@bgruening
Copy link
Contributor

We were going to change the R layout in Windows for the new version right?

Are we? You mean to enable noarch: generic builds? Who is working on this?

@mingwandroid
Copy link
Contributor

Before that you need the interpreter to have the adjusted layout, but regardless of whether you do noarch: generic or not adopting the layout change now shouldn't be harmful.

Do you want to re-sync with my recipe here though? You'd get the Windows layout changes and also openblas is now used on linux and macOS (as it was on 3.4.3).

bgruening added a commit to conda-forge/conda-forge-pinning-feedstock that referenced this pull request Aug 5, 2018
bgruening added a commit to bgruening/conda-forge-pinning-feedstock that referenced this pull request Aug 5, 2018
@bgruening
Copy link
Contributor

Do you want to re-sync with my recipe here though? You'd get the Windows layout changes and also openblas is now used on linux and macOS (as it was on 3.4.3).

That would be awesome!

@mingwandroid
Copy link
Contributor

OK I'll see if I can update my r-base to 3.5.1 then we can consider a PR?

@bgruening
Copy link
Contributor

OK I'll see if I can update my r-base to 3.5.1 then we can consider a PR?

👍 Thanks Ray!

@ocefpaf
Copy link
Member

ocefpaf commented Aug 5, 2018

Do you want to re-sync with my recipe here though?

I'm 👍 on syncing but I'm also OK merging this as-is and work on the syncing in a new PR.

@bgruening
Copy link
Contributor

@mingwandroid let me know if you want us to merge this one before you start working on a new one.

@mingwandroid
Copy link
Contributor

Go for it, I'll not bother trying to keep my own history of changes as the rebase would be tricky so I'll just base it on top of what you have when I get finished.

@bgruening bgruening merged commit 2a9819f into conda-forge:master Aug 5, 2018
@bgruening
Copy link
Contributor

Great! Thanks @dpryan79 for pushing this forward and thanks @mingwandroid for you prompt response!

@dpryan79 dpryan79 deleted the version_3.5.1 branch August 5, 2018 21:19
@dpryan79
Copy link
Contributor Author

dpryan79 commented Aug 5, 2018

Thanks everyone!

@jdblischak
Copy link
Member

Thanks @dpryan79!

A quick status update as we wait on #57: the CI builds show macOS and Linux passing but Windows failing. However, a Windows package was uploaded to Anaconda Cloud, and I was able to install and run R 3.5.1 on my local Windows machine.

@jdblischak jdblischak mentioned this pull request Aug 7, 2018
6 tasks
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.

No PNG support in R 3.4.1-hff14c37_5
7 participants