TileDB-Inc / tiledbsoma-feedstock

A conda-smithy repository for tiledbsoma.
BSD 3-Clause "New" or "Revised" License
3 stars 3 forks source link

Move past tiledbsoma 1.11.2 workaround #161

Closed johnkerl closed 1 month ago

johnkerl commented 1 month ago

157 was necessary in order to complete artifact delivery for 1.11.2.

At head of TileDB-SOMA, the patch there is no longer necessary, and in fact, attempts to apply it break nightlies as at #160.

That said, head as of this moment has at the top of its recipe/meta.yaml

{% set name = "tiledbsoma" %}
{% set version = "1.11.2" %}
{% set sha256 = "e3933c7d7b3d8df59a40ed7833fb20774917f531a915debc76abb569e958a421" %}
...
source:
  url: https://github.com/single-cell-data/TileDB-SOMA/archive/{{ version }}.tar.gz
  sha256: {{ sha256 }}

and this PR (as of the first commit) is failing CI since 1.11.2 does require the patch.

So this repo is trying to serve two masters:

Second attempt https://github.com/TileDB-Inc/tiledbsoma-feedstock/pull/161/commits/0f5c93dc28a63dc4b625d6987a45a6d86b8a70df

johnkerl commented 1 month ago

@jdblischak please see https://github.com/TileDB-Inc/tiledbsoma-feedstock/pull/161/commits/0f5c93dc28a63dc4b625d6987a45a6d86b8a70df -- also I updated the description field of this PR (probably while you were replying in the discussion log).

jdblischak commented 1 month ago

please see https://github.com/TileDB-Inc/tiledbsoma-feedstock/commit/0f5c93dc28a63dc4b625d6987a45a6d86b8a70df -- also I updated the description field of this PR (probably while you were replying in the discussion log).

Correct. I didn't see the new commit and description until after I submitted my review.

I don't think using git_url on main will work because our nightly job script uses sed to replace url: and sha256: with git_url:, git_rev, and git_depth

https://github.com/TileDB-Inc/tiledbsoma-feedstock/blob/3a0d9dc5f9a80d5c4fadf4a5856dfce91c3a5475/.github/scripts/nightly/update-recipe.sh#L13-L21

Do either of these options sound good to you?

johnkerl commented 1 month ago

I don't think using git_url on main will work because our nightly job script uses sed to replace url: and sha256: with git_url:, git_rev, and git_depth

Glarg. Thanks ...

If we want to maintain green CI on main and the nightly builds

Really up to you. If you can live with red nightly CI until 1.12.0 pre-check, I can ...

Just merge with failing linux-64 builds on main

This is my preference if you're OK with it. I know how to write sed (for 30 years now) but I don't see the one-off PR work as worth the keystroking.

Third commit: https://github.com/TileDB-Inc/tiledbsoma-feedstock/pull/161/commits/ed003050e6080f35c32829bc77ea6da6d8af9fae

jdblischak commented 1 month ago

Really up to you. If you can live with red nightly CI until 1.12.0 pre-check, I can ...

This isn't a problem for me in this case because I don't envision it causing us other problems

This is my preference if you're OK with it. I know how to write sed (for 30 years now) but I don't see the one-off PR work as worth the keystroking.

Agreed. I don't think it is worth the effort