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

Introduce version 3.6 - rebased #215

Merged
merged 10 commits into from
Oct 5, 2017

Conversation

chrisburr
Copy link
Contributor

This PR is simply #208 rebased to fix the conflicts with an additional commit to address the comments of @torsava.

If you would rather close this and rebase/merge #208 instead I am be happy with that, I just did this as I needed to build an image using Python 3.6.

@rhscl-bot
Copy link

Can one of the admins verify this patch?

@omron93
Copy link
Contributor

omron93 commented Oct 2, 2017

[test]

@centos-ci
Copy link
Collaborator

Can one of the admins verify this patch?

@torsava
Copy link
Member

torsava commented Oct 2, 2017

Looks good to me, thanks @chrisburr! Unless there are any objections, I'll merge this.

@pkubatrh
Copy link
Member

pkubatrh commented Oct 4, 2017

@chrisburr Please add the 3.6 version string into the Makefile over at:
https://github.com/chrisburr/s2i-python-container/blob/introduce-36-rebase/Makefile#L3

If this is not set the CI tests are not run against the new version (and having .exclude-rhel7 is pointless in that case).

@pkubatrh
Copy link
Member

pkubatrh commented Oct 4, 2017

Also needs a rebase before being able to be merged

@chrisburr chrisburr force-pushed the introduce-36-rebase branch 2 times, most recently from c61aa94 to 2591e92 Compare October 4, 2017 14:47
@chrisburr chrisburr force-pushed the introduce-36-rebase branch from 2591e92 to 3421404 Compare October 4, 2017 14:52
@chrisburr
Copy link
Contributor Author

@pkubatrh Done

@pkubatrh
Copy link
Member

pkubatrh commented Oct 5, 2017

[test]

@pkubatrh
Copy link
Member

pkubatrh commented Oct 5, 2017

Seems like the 3.6 scl rpms are already in centos-sclo-rh-testing. @chrisburr please also remove this line to make the CentOS tests pass:
https://github.com/chrisburr/s2i-python-container/blob/introduce-36-rebase/3.6/Dockerfile#L37

@pkubatrh
Copy link
Member

pkubatrh commented Oct 5, 2017

[test]

@pkubatrh
Copy link
Member

pkubatrh commented Oct 5, 2017

Tests are green now, thanks! LGTM.

@pkubatrh pkubatrh merged commit d94c442 into sclorg:master Oct 5, 2017
@omron93 omron93 mentioned this pull request Oct 5, 2017
@chrisburr chrisburr deleted the introduce-36-rebase branch October 5, 2017 12:07
@torsava torsava mentioned this pull request Nov 8, 2017
openshift-merge-robot added a commit to openshift/origin that referenced this pull request Nov 16, 2017
Automatic merge from submit-queue (batch tested with PRs 17327, 17281).

Add python 3.6 S2I image to examples

Python 3.6 S2I image was added by sclorg/s2i-python-container#215
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.

7 participants