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

MRG: update version of screed to >= 1.1,<2 #2415

Merged
merged 5 commits into from
Mar 5, 2023
Merged

Conversation

ctb
Copy link
Contributor

@ctb ctb commented Dec 18, 2022

Fixes #2394.

The main update in screed from 1.0.5 to 1.1 was dib-lab/screed#90, which closes an unclosed file handle.

This PR also puts an upper bound on the screed version.

@codecov
Copy link

codecov bot commented Dec 18, 2022

Codecov Report

Merging #2415 (47f40a8) into latest (f328aa2) will increase coverage by 7.76%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           latest    #2415      +/-   ##
==========================================
+ Coverage   84.81%   92.58%   +7.76%     
==========================================
  Files         133      104      -29     
  Lines       14819    12025    -2794     
  Branches     2513     2513              
==========================================
- Hits        12569    11133    -1436     
+ Misses       1948      590    -1358     
  Partials      302      302              
Flag Coverage Δ
python 92.58% <ø> (ø)
rust ?

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

Impacted Files Coverage Δ
src/core/src/lib.rs
src/core/src/storage.rs
src/core/src/cmd.rs
src/core/src/signature.rs
src/core/src/index/revindex.rs
src/core/src/errors.rs
src/core/src/ffi/mod.rs
src/core/src/index/sbt/mhbt.rs
src/core/src/ffi/cmd/compute.rs
src/core/src/encodings.rs
... and 19 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@luizirber
Copy link
Member

For nix is likely not finding the new screed version due to

sourmash/flake.nix

Lines 30 to 32 in 1c8b165

pypi-deps-db = {
url = "github:DavHau/mach-nix/3.5.0";
};
using an older version of the PyPI package index.

I have NixOS/nixpkgs#205878 open to add screed to nixpkgs, extracted from https://github.com/sourmash-bio/sourmash/pull/2393/files#diff-206b9ce276ab5971a2489d75eb1b12999d4bf3843b7988cbe8d687cfde61dea0R63 where Nix is using only deps from nixpkgs (and so no need to check PyPI updates), but both are not merged yet 🙃

@ctb ctb force-pushed the update/screed_version branch from 118bab3 to 02e41c8 Compare February 20, 2023 02:42
@ctb ctb marked this pull request as ready for review February 20, 2023 02:43
@luizirber
Copy link
Member

luizirber commented Feb 20, 2023

nix is going to fail because the latest there is screed 1.1.1, will open PR to update NixOS/nixpkgs#217269 updates it to 1.1.2

@luizirber luizirber self-requested a review March 5, 2023 01:59
@luizirber
Copy link
Member

screed versions are up-to-date enough for nix and conda-forge, so I think we can merge this

@ctb ctb changed the title WIP: update version of screed to >= 1.1,<2 MRG: update version of screed to >= 1.1,<2 Mar 5, 2023
@ctb
Copy link
Contributor Author

ctb commented Mar 5, 2023

       > ERROR: Could not find a version that satisfies the requirement screed<2,>=1.1.2 (from sourmash) (from versions: none)
       > ERROR: No matching distribution found for screed<2,>=1.1.2

@luizirber luizirber mentioned this pull request Mar 5, 2023
luizirber added a commit that referenced this pull request Mar 5, 2023
Mostly for unblocking #2415, with this update `nixpkgs` has screed `1.1.2`
@ctb ctb enabled auto-merge (squash) March 5, 2023 19:12
@ctb ctb merged commit ace25cd into latest Mar 5, 2023
@ctb ctb deleted the update/screed_version branch March 5, 2023 19:46
@ctb ctb mentioned this pull request Apr 6, 2023
1 task
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.

update sourmash requirements for screed >= 1.1
2 participants