https://bugzilla.redhat.com/show_bug.cgi?id=2036758



--- Comment #4 from Ben Beasley <[email protected]> ---
It looks like that patch works, but also reverts some commits in the original
upstream.

When a PR applies cleanly to the last release, you can just add .patch to its
URL, which is extremely convenient:
https://github.com/erikrose/parsimonious/pull/168.patch

However, that does work here because of changes that have happened in master
since the last release.

This is probably the right approach:

> git clone https://github.com/erikrose/parsimonious
> cd parsimonious
> git remote add swayson https://github.com/swayson/parsimonious
> git fetch --all
> # Normally the PR would be from a branch; here it is from master
> git checkout swayson/master
> # Make our own branch to work in
> git branch remove-nose
> git checkout remove-nose
> # Rebase, and drop all commits but the ones in the PR: 967f815 and b892772.
> git rebase -i 0.8.1
> # Manually resolve a conflict in parsimonious/tests/test_grammar.py,
> #   where a change was made in a function that was added in one of the
> #   dropped commits.
> vim parsimonious/tests/test_grammar.py
> git add parsimonious/tests/test_grammar.py
> git rebase --continue
> git format-patch 0.8.1..remove-nose

The resulting pair of patches should apply cleanly to the 0.8.1 release without
requiring any extra changes. You could use them as-is:

> Patch0:         0001-Eliminate-nose-and-use-unittest-instead.patch
> Patch1:         0002-Update-the-setup-and-tox-settings-to-pytest.patch

or form a combined patch:

> cat 0001-Eliminate-nose-and-use-unittest-instead.patch 
> 0002-Update-the-setup-and-tox-settings-to-pytest.patch > 
> parsimonious-0.8.1-drop-nose.patch


-- 
You are receiving this mail because:
You are on the CC list for the bug.
You are always notified about changes to this product and component
https://bugzilla.redhat.com/show_bug.cgi?id=2036758
_______________________________________________
package-review mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/[email protected]
Do not reply to spam on the list, report it: 
https://pagure.io/fedora-infrastructure

Reply via email to