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

cleanup README.rst to upload to pypi (bp #1030) #1031

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 29, 2019

This is an automated backport of pull request #1030 done by Mergify.io

Cherry-pick of d12a3fb has failed:

On branch mergify/bp/stable/4.2/pr-1030
Your branch is up to date with 'origin/stable/4.2'.

You are currently cherry-picking commit d12a3fb5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   README.rst

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   setup.cfg

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

@jd
Copy link
Member

jd commented May 29, 2019

Seems like we use pbr on this branch, a different patch is needed.

seems long_description needs to render cleanly to upload to pypi:
pypi/warehouse#5890

related: #1025
(cherry picked from commit d12a3fb)
@chungg chungg force-pushed the mergify/bp/stable/4.2/pr-1030 branch from ba9e600 to ca005f1 Compare May 30, 2019 00:37
@chungg
Copy link
Member

chungg commented Jul 22, 2019

i give up

@chungg chungg closed this Jul 22, 2019
@mergify mergify bot deleted the mergify/bp/stable/4.2/pr-1030 branch July 22, 2019 04:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants