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

Pre-commit updates #2427

Merged
merged 5 commits into from
Feb 5, 2024
Merged

Pre-commit updates #2427

merged 5 commits into from
Feb 5, 2024

Conversation

luizirber
Copy link
Member

@luizirber luizirber commented Dec 31, 2022

Ref #2421
Fix #2908

Updates older pre-commit hooks (initial exp: #680), mostly based (again) on tox configs

Use ruff instead of pyupgrade/isort/black/flake8

This PR has a couple of commits: the first ones update configs, the last one runs tox -e fix_lint to apply pre-commit. Mostly looking into updating the first commits without breaking tests on the last commit.

.pre-commit-config.yaml Outdated Show resolved Hide resolved
.pre-commit-config.yaml Outdated Show resolved Hide resolved
.pre-commit-config.yaml Outdated Show resolved Hide resolved
@luizirber luizirber force-pushed the lirber/precommit_updates branch 2 times, most recently from 84140f5 to de9cf97 Compare February 5, 2024 04:35
@luizirber luizirber marked this pull request as ready for review February 5, 2024 04:35
@luizirber luizirber changed the title [EXP] Pre-commit updates Pre-commit updates Feb 5, 2024
@luizirber
Copy link
Member Author

Ready for review @sourmash-bio/devs !

I suggest ignoring the "tox -e fix_lint" commit (which applies all the changes) and focus on the ones before, which set up the configuration and fix smaller things that were breaking before.

I also ignored some Ruff rules:
ignore = ["F401", "E712", "E402", "F821", "E722", "E741", "F811", "F403", "F822"]
because they didn't have autofix or the autofix broke tests. We can open follow-up PRs to remove them (one per PR?)

Copy link

codecov bot commented Feb 5, 2024

Codecov Report

Attention: 177 lines in your changes are missing coverage. Please review.

Comparison is base (b265415) 86.55% compared to head (0ef4517) 86.60%.

Files Patch % Lines
src/sourmash/sbt.py 82.00% 21 Missing and 6 partials ⚠️
src/sourmash/logging.py 12.00% 20 Missing and 2 partials ⚠️
src/sourmash/commands.py 91.26% 18 Missing ⚠️
src/sourmash/minhash.py 84.44% 13 Missing and 1 partial ⚠️
src/sourmash/command_compute.py 82.60% 9 Missing and 3 partials ⚠️
src/sourmash/lca/lca_db.py 88.75% 7 Missing and 2 partials ⚠️
src/sourmash/index/sqlite_index.py 93.16% 6 Missing and 2 partials ⚠️
src/sourmash/sig/__main__.py 94.73% 8 Missing ⚠️
src/sourmash/command_sketch.py 93.20% 4 Missing and 3 partials ⚠️
src/sourmash/lca/command_index.py 92.75% 5 Missing ⚠️
... and 21 more
Additional details and impacted files
@@            Coverage Diff             @@
##           latest    #2427      +/-   ##
==========================================
+ Coverage   86.55%   86.60%   +0.05%     
==========================================
  Files         135      135              
  Lines       15269    15264       -5     
  Branches     2618     2592      -26     
==========================================
+ Hits        13216    13220       +4     
+ Misses       1753     1744       -9     
  Partials      300      300              
Flag Coverage Δ
hypothesis-py 25.80% <15.78%> (?)
python 92.82% <91.29%> (+0.06%) ⬆️
rust 59.09% <ø> (ø)

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

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

@ctb
Copy link
Contributor

ctb commented Feb 5, 2024

Question for you, @luizirber - is there any special way we interact with old PRs after this is merged? I tried merging this with another running PR branch and it seemed to work fine, despite the multitude of changes...

@luizirber
Copy link
Member Author

Question for you, @luizirber - is there any special way we interact with old PRs after this is merged? I tried merging this with another running PR branch and it seemed to work fine, despite the multitude of changes...

should work, the pain will be the fixes for the merge itself, especially if there is a lot of code...

tox -e fix_lint is not executed in any of the GH actions, but I set up https://pre-commit.ci to run on PRs and check/apply changes in the future.

@luizirber luizirber merged commit fee6292 into latest Feb 5, 2024
39 checks passed
@luizirber luizirber deleted the lirber/precommit_updates branch February 5, 2024 16:26
@ctb
Copy link
Contributor

ctb commented Feb 5, 2024

🎉

@luizirber
Copy link
Member Author

#680 is from "May 15, 2019", so it only took almost five years to have this formatting done 😹

@ctb ctb mentioned this pull request Feb 10, 2024
ctb added a commit that referenced this pull request Feb 10, 2024
release notes: https://hackmd.io/SCoVcWS1RhCH-ndQNWF-1A?view

# sourmash release v4.8.6 - release notes

Minor new features:

* re-establish `tax` gather reading flexibility (#2986)
* update JOSS paper per pyopensci review (#2964)
* Clean up and refactor `KmerMinHash::merge` in core (#2973)
* add label output & input options to `compare` and `plot`, for better
customization (#2598)
* add utilities for using ictv taxonomic ranks with `sourmash tax`
(#2608)

Bug fixes:

* Fix `tax metagenome` to work on gather output created with
`--estimate-ani-ci` (#2952)
* fix gather memory usage issue by not accumulating `GatherResult`
(#2962)
* update the CLI docs and help for `search --containment` and `prefetch`
(#2971)

Documentation updates:

* update tutorial to remove bioconda & use sourmash-minimal (#2972)
* update readme with maintainers & sourmash comparison info (#2965)
* add branchwater reference; make FAQ more visible (#2984)
* update FAQ answer on k-mer size (#2899)
* update README with repostatus and pyver badges, and Windows support
(#2928)
* add full column descriptions for `gather` and `prefetch` output
(#2954)
* add scaled FAQ, adjust ksize answer (#2921)
* minor refactoring of gather code, small doc updates (#2953)
* Add threshold-bp and scaled relationship to faqs (#2930)

Developer updates:

* nix updates for pyopensci review (#2975)
* add scaled selection to manifest; add helper functions for collection
and sig/sketch usage (#2948)
* Pre-commit updates (#2427)
* fix upload wheel CI (#2974)
* release core; bump rust core version to r0.12.1 (#2988)
* CI: macos deployment target and maturin updates (#2879)
* MRG: bump version to 4.8.6-dev, post-release (#2877)
* fix benchmark code & a few other small issues from pyOpenSci review
(#2920)
* fix uploading of wheels after upload-artifact upgrade. (#2887)
* in core, enable downsample within select (#2931)

Dependabot updates:

* Bump pypa/cibuildwheel from 2.16.4 to 2.16.5 (#2981)
* Bump tempfile from 3.9.0 to 3.10.0 (#2979)
* Bump rkyv from 0.7.43 to 0.7.44 (#2978)
* Bump actions/cache from 3 to 4 (#2933)
* Bump actions/download-artifact from 3 to 4 (#2884)
* Bump actions/upload-artifact from 3 to 4 (#2883)
* Bump cachix/cachix-action from 13 to 14 (#2926)
* Bump cachix/install-nix-action from 24 to 25 (#2927)
* Bump chrono from 0.4.31 to 0.4.33 (#2957)
* Bump getrandom from 0.2.11 to 0.2.12 (#2924)
* Bump histogram from 0.8.3 to 0.8.4 (#2923)
* Bump histogram from 0.8.4 to 0.9.0 (#2935)
* Bump jinja2 from 3.1.2 to 3.1.3 (#2922)
* Bump memmap2 from 0.9.0 to 0.9.2 (#2882)
* Bump memmap2 from 0.9.2 to 0.9.3 (#2889)
* Bump memmap2 from 0.9.3 to 0.9.4 (#2958)
* Bump mymindstorm/setup-emsdk from 13 to 14 (#2934)
* Bump ouroboros from 0.18.1 to 0.18.2 (#2894)
* Bump ouroboros from 0.18.2 to 0.18.3 (#2936)
* Bump pypa/cibuildwheel from 2.16.2 to 2.16.4 (#2960)
* Bump rayon from 1.8.0 to 1.8.1 (#2937)
* Bump rkyv from 0.7.42 to 0.7.43 (#2880)
* Bump serde from 1.0.194 to 1.0.195 (#2901)
* Bump serde from 1.0.195 to 1.0.196 (#2956)
* Bump serde_json from 1.0.108 to 1.0.110 (#2896)
* Bump serde_json from 1.0.110 to 1.0.111 (#2902)
* Bump serde_json from 1.0.111 to 1.0.113 (#2955)
* Bump shlex from 1.1.0 to 1.3.0 (#2940)
* Bump supercharge/redis-github-action from 1.7.0 to 1.8.0 (#2885)
* Bump tempfile from 3.8.1 to 3.9.0 (#2893)
* Bump thiserror from 1.0.50 to 1.0.51 (#2881)
* Bump thiserror from 1.0.51 to 1.0.56 (#2897)
* Bump wasm-bindgen from 0.2.89 to 0.2.90 (#2925)
* Bump wasm-bindgen-test from 0.3.39 to 0.3.40 (#2938)
* Bump web-sys from 0.3.66 to 0.3.67 (#2939)
* Update pytest requirement from <7.5.0,>=6.2.4 to >=6.2.4,<8.1.0
(#2959)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

consider running flake8 and automatically fixing
2 participants