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

[build] rework tox, PEP-518, pre-commit and more #1149

Merged
merged 21 commits into from
Mar 24, 2024

Conversation

alonbl
Copy link
Contributor

@alonbl alonbl commented Mar 24, 2024

Hi @jeremiah-c-leary,
A reopen of #1141 to ease merge using GitHub if this what you prefer.
Please make sure that github merge does not lose the history.
Thanks,

Signed-off-by: Alon Bar-Lev <[email protected]>
Required by the following tests:

* attribute/test_rule_500.py
* ieee/test_rule_500.py

Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Signed-off-by: Alon Bar-Lev <[email protected]>
Copy link

codecov bot commented Mar 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 94.01%. Comparing base (6694078) to head (baf22da).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1149      +/-   ##
==========================================
- Coverage   96.49%   94.01%   -2.48%     
==========================================
  Files        1550     1557       +7     
  Lines       29321    29028     -293     
  Branches        0     3414    +3414     
==========================================
- Hits        28292    27291    -1001     
- Misses       1029     1303     +274     
- Partials        0      434     +434     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jeremiah-c-leary
Copy link
Owner

It looks like GitHub gives me three options to merge:

image

I was reading this documentation on the rebase: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github

This section seems to indicate it is better to do a rebase locally:
image

so I will follow your instructions.

@jeremiah-c-leary jeremiah-c-leary merged commit baf22da into jeremiah-c-leary:master Mar 24, 2024
11 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants