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

Origin #1681

Merged
merged 8 commits into from
Feb 10, 2019
Merged

Origin #1681

merged 8 commits into from
Feb 10, 2019

Conversation

strubbi77
Copy link
Contributor

Changed further recipes so other errors than no valid dependency graph will occur

@strubbi77
Copy link
Contributor Author

libtribler has a dependency to pil where I read somewhere that it doesn`t build with python3. So I added this conflicts value.

With openssl I had an issue to run "p4a recipes". And here probably the conflicts entry was overkill. So it`s worth a try without the conflicts entry. I can test this evening.

Copy link
Member

@inclement inclement left a comment

Choose a reason for hiding this comment

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

Thanks! Actually, for the modules that specified a single python version it is sufficient to take out all the references to python so then any will work, would you mind making that change?

pythonforandroid/recipes/cherrypy/__init__.py Outdated Show resolved Hide resolved
pythonforandroid/recipes/feedparser/__init__.py Outdated Show resolved Hide resolved
pythonforandroid/recipes/ruamel.yaml/__init__.py Outdated Show resolved Hide resolved
pythonforandroid/recipes/zope/__init__.py Outdated Show resolved Hide resolved
Removed unnecessary hostpython*
Removed unnecessary hostpython*
Removed unnecessary python*
Removed unnecessary python*
Removed conflicts because it was wrong
Copy link
Member

@AndreMiras AndreMiras left a comment

Choose a reason for hiding this comment

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

Looking good now thanks!
I'll squash and merge once Travis build is done and green.
Geek-tip for later: try to squash yourself and use meaningful commit message

@AndreMiras
Copy link
Member

Build is green on core recipes, plus conditional build see below relevant part of the log:

[INFO]:    recipes modified: {'zope', 'openssl', 'libtribler', 'cherrypy', 'feedparser', 'ruamel.yaml', 'kiwisolver'}
[INFO]:    recipes to build: {'zope', 'libtribler', 'cherrypy', 'feedparser', 'ruamel.yaml', 'kiwisolver'}
[INFO]:    incompatible with python3
[INFO]:    falling back to python2
[INFO]:    recipes to build (no broken): {'cherrypy', 'feedparser', 'ruamel.yaml'}
[INFO]:    requirements: cherrypy,feedparser,ruamel.yaml,python2

See detailed log here: https://travis-ci.org/kivy/python-for-android/jobs/489999998

Since all comments got addressed @inclement I hope you don't mind if I dismiss your review as it seems to be blocking the merge. The PR is not touching critical components anyway

@AndreMiras
Copy link
Member

AndreMiras commented Feb 9, 2019

Well actually I won't dismiss because it's presented like it would delete the comments.
Then @inclement could you approve & squash-merge?

@inclement inclement merged commit e7c1117 into kivy:master Feb 10, 2019
@inclement
Copy link
Member

Thanks!

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