jpmorganchase / jupyter-fs

A filesystem-like contents manager for multiple backends in Jupyter
Apache License 2.0
200 stars 36 forks source link

Reconcile hard fork now that access is restored #174

Closed timkpaine closed 11 months ago

timkpaine commented 1 year ago

I have now deleted my hard fork, this is the omnibus PR to resolve the differences: Fixes: #172 Closes: https://github.com/jpmorganchase/jupyter-fs/pull/170 Closes: https://github.com/jpmorganchase/jupyter-fs/pull/169 Closes: https://github.com/jpmorganchase/jupyter-fs/pull/163 Closes: https://github.com/jpmorganchase/jupyter-fs/pull/162 Closes: https://github.com/jpmorganchase/jupyter-fs/pull/161

github-actions[bot] commented 1 year ago

Binder Launch a binder notebook on branch timkpaine/jupyter-fs/main

codecov[bot] commented 1 year ago

Codecov Report

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

Comparison is base (19f47a9) 40.50% compared to head (55e2a00) 37.86%. Report is 6 commits behind head on main.

Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #174 +/- ## ========================================== - Coverage 40.50% 37.86% -2.65% ========================================== Files 23 31 +8 Lines 1153 1965 +812 Branches 143 312 +169 ========================================== + Hits 467 744 +277 - Misses 643 1119 +476 - Partials 43 102 +59 ``` | [Files](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase) | Coverage Δ | | |---|---|---| | [js/src/tokens.ts](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anMvc3JjL3Rva2Vucy50cw==) | `100.00% <100.00%> (ø)` | | | [js/src/utils.ts](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anMvc3JjL3V0aWxzLnRz) | `13.25% <100.00%> (-1.04%)` | :arrow_down: | | [jupyterfs/config.py](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anVweXRlcmZzL2NvbmZpZy5weQ==) | `100.00% <100.00%> (ø)` | | | [jupyterfs/tests/test\_extension.py](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anVweXRlcmZzL3Rlc3RzL3Rlc3RfZXh0ZW5zaW9uLnB5) | `100.00% <100.00%> (ø)` | | | [jupyterfs/tests/test\_fsmanager.py](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anVweXRlcmZzL3Rlc3RzL3Rlc3RfZnNtYW5hZ2VyLnB5) | `98.97% <100.00%> (+0.18%)` | :arrow_up: | | [jupyterfs/tests/test\_metamanager.py](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anVweXRlcmZzL3Rlc3RzL3Rlc3RfbWV0YW1hbmFnZXIucHk=) | `97.91% <97.91%> (ø)` | | | [jupyterfs/extension.py](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anVweXRlcmZzL2V4dGVuc2lvbi5weQ==) | `71.42% <0.00%> (-2.26%)` | :arrow_down: | | [jupyterfs/tests/utils/client.py](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anVweXRlcmZzL3Rlc3RzL3V0aWxzL2NsaWVudC5weQ==) | `77.27% <77.27%> (ø)` | | | [jupyterfs/metamanager.py](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anVweXRlcmZzL21ldGFtYW5hZ2VyLnB5) | `71.42% <83.72%> (+38.61%)` | :arrow_up: | | [jupyterfs/pathutils.py](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase#diff-anVweXRlcmZzL3BhdGh1dGlscy5weQ==) | `67.16% <61.90%> (+36.01%)` | :arrow_up: | | ... and [9 more](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase) | | ... and [3 files with indirect coverage changes](https://app.codecov.io/gh/jpmorganchase/jupyter-fs/pull/174/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=jpmorganchase)

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

timkpaine commented 11 months ago

@vidartf @brooklynrob @t3rryM please merge or restore my ability to do so, thanks!

vidartf commented 11 months ago

Thanks for reconciling the different merge conflicts!