STYLE double-quote cython strings #21

[DeaMariaLeon]

task here is:

add id: double-quote-cython-strings to

pandas/.pre-commit-config.yaml

Line 29 in 3d0d197

- id: cython-lint

run pre-commit run double-quote-cython-strings --all-files

git add -u, git commit -m 'double quote cython strings', git push origin HEAD`

Motivation for this comes from #49866 (comment)

pyData 2022 sprint
noatamir/pyladies-berlin-sprints#21

@jorisvandenbossche, @MarcoGorelli, @WillAyd, @rhshadrach, @phofl @noatamir

[phofl]

Cool! Could you merge main? There seems to be a conflict

[DeaMariaLeon]

Cool! Could you merge main? There seems to be a conflict

Locally? or here? I got lost

[phofl]

Locally, and then you can push to this branch

[MarcoGorelli]

you'll do it locally, and then push - something like

git fetch upstream git merge upstream/main <fix up merge conflicts> git add -u git commit git push origin HEAD 

[DeaMariaLeon]

git fetch upstream
git merge upstream/main
fixed conflicts
git add -u
git commit

Run the previous commands. After that there is a test that failed

double-quote Cython strings.............................................................................Failed - hook id: double-quote-cython-strings - exit code: 1 - files were modified by this hook 

I still tried to push to my origin (maybe I shouldn't have) but then there is a message "Everything up-to-date"

[MarcoGorelli]

after that, you'll need to stage and commit again:

git add -u git commit -a -m 'your commit message goes here' 

[phofl]

Yep this means that the code you pulled still had single quotes. pre-commit fixed it, so if you commit again you should be good

[DeaMariaLeon]

after that, you'll need to stage and commit again:

git add -u git commit -a -m 'your commit message goes here' 

after fixing merge conflicts, git add and commit has to be done twice?

[phofl]

Only if pre commit fails

[MarcoGorelli]

pre-commit will block your commit if any of the hooks' checks fail, or if they modified your files. here, one of them modified your files. so you'll need to stage (git add -u) and commit (git commit -m 'commit message') again

[phofl]

Looks good!

[DeaMariaLeon]

Should I just wait now? :)

[phofl]

Yep the ci runs around 2 hours. We will merge after everything is green

[MarcoGorelli]

thanks @DeaMariaLeon ! in before more merge conflicts

[DeaMariaLeon]

Thanks All for your patience :)