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

Add support for yapf>=0.21.0<0.27.0 and fix filename in .ci/generate_bear_metadata.py #2880

Merged
merged 2 commits into from
Jul 24, 2019

Conversation

areebbeigh
Copy link
Member

@areebbeigh areebbeigh commented Feb 20, 2019

Modify test_allow_multiline_lambdas to be
version specific.

Closes #2873

Change "overrides" filename from
package-manager-requirements.yaml to pm-requirements.yaml

Fixes #2936

Checklist

  • I read the commit guidelines and I've followed
    them.
  • I ran coala over my code locally. (All commits have to pass
    individually.
    It is not sufficient to have "fixup commits" on your PR,
    our bot will still report the issues for the previous commit.) You will
    likely receive a lot of bot comments and build failures if coala does not
    pass on every single commit!

Copy link
Member

@jayvdb jayvdb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs a rebase

@areebbeigh
Copy link
Member Author

areebbeigh commented Jul 22, 2019

Needs a rebase

Done.
Heads up: Merge conflict in bear-requirements.yaml was resolved by hand (merge both incoming changes). Please let me know if I'm supposed to re-generate it.

@jayvdb
Copy link
Member

jayvdb commented Jul 22, 2019

Refetch master bear-requirements.yaml

Use .ci/generate_bear_metadata.py , and then run moban.

@areebbeigh
Copy link
Member Author

.ci/generate_bear_metadata.py

I'm running into:

Warning: Both package-manager-requirements.yaml and /home/areebbeigh/.cache/moban/repos/mobans/package-manager-requirements.yaml does not exist

and I suspect this is because running ci/generate_bear_metadata.py sets overrides: package-manager-requirements.yaml whereas it should be overrides: pm-requirements.yaml.

New issue? Although this is probably just a change in

requirements['overrides'] = 'package-manager-requirements.yaml'

@jayvdb
Copy link
Member

jayvdb commented Jul 22, 2019

Yup; new issue. That is a bug in my PR.

@jayvdb
Copy link
Member

jayvdb commented Jul 22, 2019

You can add the fix to this PR as a separate commit.

@areebbeigh areebbeigh force-pushed the issue-2873 branch 2 times, most recently from e6e5f88 to 6926c0e Compare July 22, 2019 14:17
@areebbeigh areebbeigh changed the title Add support for yapf>=0.21.0<0.27.0 Add support for yapf>=0.21.0<0.27.0 and fix filename in .ci/generate_bear_metadata.py Jul 22, 2019
@areebbeigh
Copy link
Member Author

You can add the fix to this PR as a separate commit.

Done.

@jayvdb
Copy link
Member

jayvdb commented Jul 23, 2019

Sorry ; wrong button press.

@areebbeigh , this needs another rebase, but please also revise your commit messages to follow the coala commit guidelines. specifically the first line should start with a filename of the most important file in the commit which is being modified (usually not a file which is generated).

Modify test_allow_multiline_lambdas to be
version specific.

Closes coala#2873
Change "overrides" filename from
package-manager-requirements.yaml to pm-requirements.yaml

Fixes coala#2936
@jayvdb
Copy link
Member

jayvdb commented Jul 24, 2019

I'm going to merge this despite it failing due to #2937 , which I'll fix after this is merged

@jayvdb jayvdb merged commit 6c20ca4 into coala:master Jul 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
6 participants