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

Quiltcore java preview #122

Merged
merged 29 commits into from
Sep 11, 2023
Merged

Quiltcore java preview #122

merged 29 commits into from
Sep 11, 2023

Conversation

drernie
Copy link
Member

@drernie drernie commented Sep 4, 2023

Ernie's updates for Sep 6

dimaryaz and others added 21 commits August 23, 2023 07:07
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [actions/checkout](https://togithub.com/actions/checkout) | action |
major | `v3` -> `v4` |

---

### Release Notes

<details>
<summary>actions/checkout (actions/checkout)</summary>

###
[`v4`](https://togithub.com/actions/checkout/blob/HEAD/CHANGELOG.md#v400)

[Compare Source](https://togithub.com/actions/checkout/compare/v3...v4)

- [Support fetching without the --progress
option](https://togithub.com/actions/checkout/pull/1067)
-   [Update to node20](https://togithub.com/actions/checkout/pull/1436)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/quiltdata/nf-quilt).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi43OC44IiwidXBkYXRlZEluVmVyIjoiMzYuNzguOCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.slf4j:slf4j-api](http://www.slf4j.org)
([source](https://togithub.com/qos-ch/slf4j)) | `2.0.7` -> `2.0.9` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/org.slf4j:slf4j-api/2.0.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.slf4j:slf4j-api/2.0.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.slf4j:slf4j-api/2.0.7/2.0.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.slf4j:slf4j-api/2.0.7/2.0.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/quiltdata/nf-quilt).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi43OC44IiwidXBkYXRlZEluVmVyIjoiMzYuNzguOCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [org.slf4j:slf4j-simple](http://www.slf4j.org)
([source](https://togithub.com/qos-ch/slf4j)) | `2.0.7` -> `2.0.9` |
[![age](https://developer.mend.io/api/mc/badges/age/maven/org.slf4j:slf4j-simple/2.0.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/org.slf4j:slf4j-simple/2.0.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/org.slf4j:slf4j-simple/2.0.7/2.0.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/org.slf4j:slf4j-simple/2.0.7/2.0.9?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/quiltdata/nf-quilt).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi43OC44IiwidXBkYXRlZEluVmVyIjoiMzYuNzguOCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
wrap hash, namespace, manifest
@drernie drernie requested a review from dimaryaz September 5, 2023 00:06
@drernie
Copy link
Member Author

drernie commented Sep 8, 2023

@dimaryaz Are you okay with me merging this into your quiltcore-java-demo branch? Or should I merge it to master, and have you pull from there?

@dimaryaz
Copy link
Contributor

dimaryaz commented Sep 8, 2023

Reviewing it now, but you can merge into my branch if you want. For master, I think it's good to review everything and squash all the commits.

Manifest manifest = packageManifest()
// get names of entries
List<String> children = manifest.getEntries().keySet().collect { String key ->
if (key.startsWith(subpath)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Make sure that this handles "/" properly? I.e., that filtering for "/a" includes "/a/b", but not "/ab"?

Copy link
Member Author

Choose a reason for hiding this comment

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

Can you clarify? Is a leading "/" required? Do we only require the full folder for absolute subpaths?
Specifically, what's the expected result for these subpaths when the package contains ".ipynb_checkpoints/data_products-checkpoint.ipynb"?

        subpath               | expected_size
        ''                    | 8
        '.ipynb_checkpoints'  | 1
        '/.ipynb_checkpoints' | 1
        '.ipynb'              | 1
        '/.ipynb'             | 0

Copy link
Member Author

Choose a reason for hiding this comment

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

I am very confused by this. I rewrote the test to make sense for me, which is:

        where:
        subpath               | expected_size
        ''                    | 8
        '.ipynb_checkpoints'  | 1
        '.ipynb_checkpoints/' | 1
        '.ipynb'              | 1
        '.ipynb/'             | 0

drernie and others added 2 commits September 8, 2023 16:50
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@drernie drernie merged commit 41d6063 into quiltcore-java-demo Sep 11, 2023
11 checks passed
@drernie drernie deleted the quiltcore-java-preview branch September 11, 2023 22:23
drernie added a commit that referenced this pull request Sep 18, 2023
commit 016c59f
Author: Dima Ryazanov <[email protected]>
Date:   Mon Sep 18 07:16:20 2023 -0700

    Bump quiltcore and use workflows

commit 843d22b
Author: Ernest Prabhakar <[email protected]>
Date:   Mon Sep 11 15:35:28 2023 -0700

    re-enabled failing workflow tests

commit 41d6063
Author: Dr. Ernie Prabhakar <[email protected]>
Date:   Mon Sep 11 15:23:07 2023 -0700

    Quiltcore java preview (#122)

    Ernie's updates for Sep 6-11
    - Added unit and integration tests
    - Rewrote package to NOT pre-install (instead use Manifest to find relativeChildren)

    ---------

    Co-authored-by: Dima Ryazanov <[email protected]>
    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
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.

2 participants