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

[python/ci] Restore pre-merge lint checks #2247

Merged
merged 2 commits into from
Mar 11, 2024
Merged

[python/ci] Restore pre-merge lint checks #2247

merged 2 commits into from
Mar 11, 2024

Conversation

ryan-williams
Copy link
Member

@ryan-williams ryan-williams commented Mar 11, 2024

Issue and/or context: #2238 (comment)

Tracking issue: #2248

3.10 was removed from the CI matrix, but the lint/codecov conditions were not updated, inadvertently removing those checks from pre-merge CI.

@johnkerl
Copy link
Member

Ohhhhhh :headdesk: ... this is my bad, thanks for catching it @ryan-williams !!

Copy link

codecov bot commented Mar 11, 2024

Codecov Report

Merging #2247 (6d18e58) into main (6b50fa9) will increase coverage by 0.24%.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2247      +/-   ##
==========================================
+ Coverage   78.54%   78.79%   +0.24%     
==========================================
  Files         137      137              
  Lines       10684    10710      +26     
  Branches      215      215              
==========================================
+ Hits         8392     8439      +47     
+ Misses       2194     2173      -21     
  Partials       98       98              
Flag Coverage Δ
libtiledbsoma 67.64% <ø> (ø)
python 90.79% <ø> (+0.61%) ⬆️
r 74.69% <ø> (ø)

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

Components Coverage Δ
python_api 90.79% <ø> (+0.61%) ⬆️
libtiledbsoma 48.85% <ø> (ø)

@ryan-williams
Copy link
Member Author

ryan-williams commented Mar 11, 2024

2nd commit here fixes lint-rot that crept in last week (causing python-ci-full failures), xref #2236, #2047

@ryan-williams ryan-williams marked this pull request as ready for review March 11, 2024 17:46
@ryan-williams ryan-williams requested a review from johnkerl March 11, 2024 17:47
@johnkerl
Copy link
Member

I made #2248 to track

Copy link
Member

@johnkerl johnkerl left a comment

Choose a reason for hiding this comment

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

🔥

@johnkerl johnkerl merged commit 874ccb2 into main Mar 11, 2024
15 checks passed
@johnkerl johnkerl deleted the rw/ci-lint branch March 11, 2024 20:14
Copy link

The backport to release-1.8 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-release-1.8 release-1.8
# Navigate to the new working tree
cd .worktrees/backport-release-1.8
# Create a new branch
git switch --create backport-2247-to-release-1.8
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 874ccb2540706132c624dc6c81823152bb9a3342
# Push it to GitHub
git push --set-upstream origin backport-2247-to-release-1.8
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-1.8

Then, create a pull request where the base branch is release-1.8 and the compare/head branch is backport-2247-to-release-1.8.

@johnkerl johnkerl changed the title Restore pre-merge lint checks [python/ci] Restore pre-merge lint checks Mar 13, 2024
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.

2 participants