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

New CI fixes #1185

Merged
merged 4 commits into from
Feb 20, 2022
Merged

New CI fixes #1185

merged 4 commits into from
Feb 20, 2022

Conversation

tobias-urdin
Copy link
Contributor

@tobias-urdin tobias-urdin commented Feb 15, 2022

This contains new CI fixes.

  • pyparsing >= 3.0.0 changed behavior of __bool__ on pyparsing.ParseResult class
  • Update asserRegex for gabbi tests where pyparsing changed the output
  • Update mergify config to remove the strict key in the merge dict

The newer pyparsing versions no differs on the
usage of __bool__ so we can check the list instead.
@tobias-urdin tobias-urdin changed the title Check len() on pyparsing.ParseResult.asList() New CI fixes Feb 15, 2022
.mergify.yml Outdated Show resolved Hide resolved
@tobias-urdin
Copy link
Contributor Author

Do not merge, pushed commit to test pyparsing change with pyparsing <3.0.0 versions.

@tobias-urdin
Copy link
Contributor Author

Verified with pyparsing==2.4.7 - reverting test changes.

@@ -1,26 +1,46 @@
queue_rules:
- name: default
conditions:
Copy link
Member

Choose a reason for hiding this comment

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

if they are identical to condition to be put in queue you don't need to repeat them fwiw.

Copy link
Member

@jd jd left a comment

Choose a reason for hiding this comment

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

I'd prefer 2 PR but ok :)

@jd
Copy link
Member

jd commented Feb 19, 2022

I'm not clicking merge but you can (and need to) merge manually @tobias-urdin

@tobias-urdin tobias-urdin merged commit 94ae8c0 into gnocchixyz:master Feb 20, 2022
@tobias-urdin
Copy link
Contributor Author

@Mergifyio backport stable/4.4

@mergify mergify bot mentioned this pull request Feb 20, 2022
@mergify
Copy link
Contributor

mergify bot commented Feb 20, 2022

backport stable/4.4

✅ Backports have been created

mergify bot added a commit that referenced this pull request Feb 20, 2022
@tobias-urdin
Copy link
Contributor Author

@Mergifyio backport stable/4.3

@mergify mergify bot mentioned this pull request Feb 20, 2022
@mergify
Copy link
Contributor

mergify bot commented Feb 20, 2022

backport stable/4.3

✅ Backports have been created

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants