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

CI: Fix changed flake8 error message after upgrade #41462

Merged
merged 1 commit into from
May 14, 2021

Conversation

phofl
Copy link
Member

@phofl phofl commented May 13, 2021

Upgrade caused ci on 1.2.x to fail. Should backport probably

@phofl phofl added CI Continuous Integration Code Style Code style, linting, code_checks labels May 13, 2021
@jreback jreback added this to the 1.2.5 milestone May 14, 2021
@jreback
Copy link
Contributor

jreback commented May 14, 2021

ok i suppose to backport, though we usually don't do the pre-commit

@jreback jreback merged commit bfa7525 into pandas-dev:master May 14, 2021
@lumberbot-app
Copy link

lumberbot-app bot commented May 14, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 bfa75255849ed1473679948a1e4197886a252bdb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #41462: CI: Fix changed flake8 error message after upgrade'
  1. Push to a named branch :
git push YOURFORK 1.2.x:auto-backport-of-pr-41462-on-1.2.x
  1. Create a PR against branch 1.2.x, I would have named this PR:

"Backport PR #41462 on branch 1.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@jreback
Copy link
Contributor

jreback commented May 14, 2021

@meeseeksdev backport 1.2.x

@lumberbot-app
Copy link

lumberbot-app bot commented May 14, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 bfa75255849ed1473679948a1e4197886a252bdb
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #41462: CI: Fix changed flake8 error message after upgrade'
  1. Push to a named branch :
git push YOURFORK 1.2.x:auto-backport-of-pr-41462-on-1.2.x
  1. Create a PR against branch 1.2.x, I would have named this PR:

"Backport PR #41462 on branch 1.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@phofl phofl deleted the flake8_upgrade branch May 14, 2021 20:18
phofl added a commit to phofl/pandas that referenced this pull request May 14, 2021
…ter upgrade (pandas-dev#41462)

(cherry picked from commit bfa7525)

# Conflicts:
#	.pre-commit-config.yaml
#	environment.yml
#	requirements-dev.txt
phofl added a commit to phofl/pandas that referenced this pull request May 14, 2021
JulianWgs pushed a commit to JulianWgs/pandas that referenced this pull request Jul 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration Code Style Code style, linting, code_checks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants