Skip to content

reportlab, preppy & pyrxp should depend on hostpython #1182

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

Closed
wants to merge 5 commits into from
Closed

reportlab, preppy & pyrxp should depend on hostpython #1182

wants to merge 5 commits into from

Conversation

replabrobin
Copy link
Contributor

These all work for python2.7 >=3.3 so I changed to make depend on hostpython. This also fixes problems caused by installing preppy too early. Sorry for double pull. Am still a newby to buildozer etc etc

@inclement
Copy link
Member

The depends should probably be python2, not hostpython. Does that work for you?

@replabrobin
Copy link
Contributor Author

It works for me, but is python2 not restricting just to python2? reportlab, pyrxp & preppy will all work in python>=3.3. I thought hostpython was a kind of meta recipe. I normally use python 2.7 so will be happy with that. The lack of python2/hostpython in preppy caused the python2 build to fail because the python2 installation failed because the lib dir was created too early.

@inclement
Copy link
Member

inclement commented Nov 25, 2017 via email

@replabrobin
Copy link
Contributor Author

replabrobin commented Nov 25, 2017

OK I change to use python2,python3crystax and check they build at least for python2. Now done.

@AndreMiras
Copy link
Member

Hi @replabrobin thanks for the PR, looking good to me, sorry for the delay.
Could you simply fix the conflicts and squash the commits, then we're good to merge 👍

@replabrobin
Copy link
Contributor Author

replabrobin commented Sep 17, 2018

Hi, I'm no longer working actively with Kivy, but I can try to do what you request. I am not a git person so I'm unsure how to do what you want in the context of the existing PR. I did the following to my fork

  1. merge upstream/master
  2. fix conflict in __init__.py
  3. commit the merge
  4. push

so my repository is allegedly up to date and has my changes.

@AndreMiras
Copy link
Member

OK sad to see you go. Yep open source projects are another nice excuses to ramp up skills also in git.
The workflow I do, is:

  1. git rebase upstream/master
  2. git reset --soft HEAD~<n>
  3. git commit -a -m "Nice commit title\n\nNice commit body"

Little explanation here:

  1. So the rebasing rather than pulling so that your changes goes on top and you don't create a commit just for merging FROM upstream. You can read about rebasing and squashing.
  2. This is one way to squash commits into one, but there're other ways. Basically if you take a look at your pull request commits, there're 5 commits but at the end we want to keep only one with the simple line change. So squashing keeps the history clean. Most of pull requests should be one commit.
  3. I like to have a descriptive title and a comprehensive body. For your PR the title is enough, but otherwise I like to have a detailed body that follows the 50/72 rule.

If you want I'm on IRC today I would be happy if we go through it together.

@replabrobin
Copy link
Contributor Author

I tried your approach, but I think my existing fork is preventing a reasonable solution. is it not simpler to just retry the fork and patch to make a new pull request?

@AndreMiras
Copy link
Member

Yes you could make a new one of course it's simpler when you're not used to rebasing/squashing, but it creates some noise on the issue tracker. I'm fine with it, but I would also be more than happy to assist you on discord to do it http://chat.kivy.org ping me when you're there

@replabrobin
Copy link
Contributor Author

I am really sorry, but I have no time to learn github workflows; if you want to apply the changes your self I attach a patch.
p4a-rl-dependency.patch.txt

@AndreMiras
Copy link
Member

I can understand you don't have time for it, no worries. You can also just give me write access to your branch/PR and probably I should be able to do it.
https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork/

@replabrobin
Copy link
Contributor Author

Hi I see the 'Allow edits from maintainers.' checkbox is already ticked. I didn't do that myself (so far as I can recall), but does that allow you to proceed?

@AndreMiras
Copy link
Member

OK no worries it actually is to the fork that i need access if I want to rebase.
https://help.github.com/articles/committing-changes-to-a-pull-request-branch-created-from-a-fork/

I've created a follow up pull request here #1377 (commit author is still you) so we can close that one.
Thank for your contributions!

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

Successfully merging this pull request may close these issues.

3 participants