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

Pin black #16712

Merged
merged 2 commits into from
Jan 29, 2024
Merged

Pin black #16712

merged 2 commits into from
Jan 29, 2024

Conversation

FlorentClarret
Copy link
Member

@FlorentClarret FlorentClarret commented Jan 26, 2024

What does this PR do?

Pin black

Motivation

koxudaxi/datamodel-code-generator#1821 broke us, the ddev validation models now fails.

Additional Notes

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Changelog entries must be created for modifications to shipped code
  • Add the qa/skip-qa label if the PR doesn't need to be tested during QA.

@FlorentClarret FlorentClarret requested a review from a team as a code owner January 26, 2024 16:07
@ghost ghost added the dev_package label Jan 26, 2024
@FlorentClarret FlorentClarret force-pushed the florentclarret/ddev/pin_black branch from 5e5fead to 75a7a0e Compare January 26, 2024 16:08
Copy link

codecov bot commented Jan 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (9ca8b39) 90.52% compared to head (d4bf230) 90.61%.
Report is 2 commits behind head on master.

Additional details and impacted files
Flag Coverage Δ
activemq ?
cassandra ?
confluent_platform ?
datadog_checks_dev 82.53% <ø> (+0.01%) ⬆️
hive ?
hivemq ?
hudi ?
ignite ?
jboss_wildfly ?
kafka ?
presto ?
solr ?
weblogic ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link

Test Results

  4 files    4 suites   3m 40s ⏱️
430 tests 430 ✅  0 💤 0 ❌
960 runs  927 ✅ 33 💤 0 ❌

Results for commit d4bf230.

@FlorentClarret FlorentClarret merged commit 14fa9ab into master Jan 29, 2024
40 checks passed
@FlorentClarret FlorentClarret deleted the florentclarret/ddev/pin_black branch January 29, 2024 07:26
@koxudaxi
Copy link

koxudaxi commented Feb 2, 2024

@FlorentClarret
I'm sorry for my slow action.
I have released the fixed version 0.25.3 of datamodel-code-generator last night.

@FlorentClarret
Copy link
Member Author

@FlorentClarret I'm sorry for my slow action. I have released the fixed version 0.25.3 of datamodel-code-generator last night.

No worries at all! It's completely fine. Thank for the update on this, I'll open a PR to use the latest version 🙂

ghost pushed a commit that referenced this pull request Feb 5, 2024
* Pin black

* Update datadog_checks_dev/pyproject.toml

(cherry picked from commit 14fa9ab)
@ghost ghost mentioned this pull request Feb 5, 2024
@ghost
Copy link

ghost commented Feb 6, 2024

The backport to 7.51.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.51.x 7.51.x
# Navigate to the new working tree
cd .worktrees/backport-7.51.x
# Create a new branch
git switch --create backport-16712-to-7.51.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 14fa9abd24f9c3c45830bed48c9c8c75515ac390
# Push it to GitHub
git push --set-upstream origin backport-16712-to-7.51.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.51.x

Then, create a pull request where the base branch is 7.51.x and the compare/head branch is backport-16712-to-7.51.x.

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

Successfully merging this pull request may close these issues.

5 participants