TST: Fix test_eval.py

[dsm054]

Fixes typos found in #GH 6069. Does not change the tests to ensure those branches are exercised.

[cpcloud]

Looks like u have an extra commit in there

[dsm054]

Urf. You're right. If I squash 'em, is there a way to associate the new PR with this one or should I close and open a new one?

[cpcloud]

No no don't do that. Hold on a sec I'll show u how to just get that commit out

[cpcloud]

Just peel it off like so:

git reset HEAD~1
git stash
git reset --hard upstream/master
git stash pop
git add .
git commit -m'TST: fix test_eval typos'

[cpcloud]

alternatively you could probably cherry pick the commit into a new branch, reset hard on upstream/master and then merge the branch u just created back into the one u just reset

[cpcloud]

something like this

(say you're on a branch called orig_branch)

git checkout -b tmp
git cherry-pick 42e3a76
git checkout orig_branch
git reset --hard upstream/master
git merge tmp
git branch -D tmp
git push --force

[cpcloud]

Or if you want I can merge this :)

[dsm054]

Hmm. I followed the cherry-pick instructions, but I'm not sure what the effect was; that branch still seems to show two commits, and the result of git push --force was eacc354..1020b51 master -> master with no reference to the fix-test_eval branch.

[cpcloud]

now that i think about it i don't think it makes sense to cherry pick here ... the first instructions are what i use when i do this ... you can just mutate the branch rather than having to make a new one

[cpcloud]

bam!

[dsm054]

Thanks for the assistance! I'm afraid my brain is pre-git, and I can't afford the upgrade.

[cpcloud]

:) It's okay, my git chops are getting rusty hope cherry picking wasn't cherry bombing instead

[cpcloud]

Thx