Basic Zarr-python 2.x compatibility changes - #2098

Merged
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat
Sep 20, 2024
Merged

Basic Zarr-python 2.x compatibility changes#2098
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

Demonstration of some changes for backwards compatibility being discussed at #2097

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)


@classmethod
async def create(
async def from_store(

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

In 2.x, Group.create was used to create an array in the Group.

I slightly prefer from_* for alternative constructors anyway, so maybe this is a strict improvement and not just a compatibility shim?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree that this needs to change in order to avoid confusion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i'm also a fan of from_X, and from_store seems good

def open(
*,
store: StoreLike | None = None,
*,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can vendor and use https://github.com/scikit-learn/scikit-learn/blob/e87b32a81c70abed8f2e97483758eb64df8255e9/sklearn/utils/validation.py#L32 to deprecate positional arguments. At least of xarray, it passed just store as a positional argument, but deprecating these doesn't feel like too much work.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like this suggestion. Should we do it in 2.18.3 or 3.0 though?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't have a strong preference here.

IMO, calendar time is more meaningful than version numbers for giving projects time to adapt to changes. So I'd say deprecate it in 3.0, as long as we don't have a hard stance on requiring keyword only for these APIs in 3.0

Comment threadsrc/zarr/core/attributes.py Outdated
Comment threadsrc/zarr/core/group.py Outdated
store_path: StorePath

@property
def store(self) -> Store:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Should we deprecate this, and encourage users to do group.store_path.store?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

github is flagging this conversation as outdated, but regardless: I agree that we should just have either group.store or group.store_path.store. But I'm not a huge fan of store_path actually, so I'd actually favor deprecating that, and going back to v2 behavior where arrays / groups have a store attribute, and the store has a path attribute. But this is just my personal opinion, built from finding group.store_path.store a little weird.

Comment threadsrc/zarr/core/group.py Outdated
return self._async_group.store

@property
def read_only(self) -> bool:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Same question as store.

Should probably add this to AsyncGroup too and update this implementation.

@TomAugspurgerTomAugspurger mentioned this pull request Aug 20, 2024
@jhamman

Copy link
Copy Markdown
Member

@TomAugspurger - this generally looks like a solid set of fixes. Do you have more here or should try to wrap these up?

@TomAugspurger
TomAugspurger marked this pull request as ready for review August 28, 2024 19:24
@TomAugspurgerTomAugspurger changed the title [WIP]: Draft of zarr-python 2.x compatibility changesBasic Zarr-python 2.x compatibility changesSep 3, 2024
Comment threadtests/v3/test_attributes.py Outdated
import zarr.store


def test_put():

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in principle we could test this functionality for other stores. but I also think testing the full product of [array / group features * stores] is excessive. I guess as long as we are confident that we are densely testing the core store APIs across store types, then it's fine to just test something derived from the store APIs on a single store.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I think that in this case it's probably OK, since the test here is focused on the behavior of Attributes. This happens to require a reference to a Group (which requires a Store) but hopefully that interface is sufficiently covered by other tests.

@jhammanjhamman added the V3 label Sep 13, 2024
@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I've confirmed that #2157 fixes the CI failure here.

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @TomAugspurger for pulling these together. Much improved compatibility with v2.

@jhamman
jhamman merged commit 6900754 into zarr-developers:v3Sep 20, 2024
@TomAugspurger
TomAugspurger deleted the user/tom/fix/v2-compat branch September 20, 2024 15:02
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
@jhammanjhamman added this to the 3.0.0.beta milestone Oct 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@TomAugspurger@jhamman@d-v-b
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Basic Zarr-python 2.x compatibility changes - #2098

Merged
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat
Sep 20, 2024
Merged

Basic Zarr-python 2.x compatibility changes#2098
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

Demonstration of some changes for backwards compatibility being discussed at #2097

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)


@classmethod
async def create(
async def from_store(

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

In 2.x, Group.create was used to create an array in the Group.

I slightly prefer from_* for alternative constructors anyway, so maybe this is a strict improvement and not just a compatibility shim?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree that this needs to change in order to avoid confusion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i'm also a fan of from_X, and from_store seems good

def open(
*,
store: StoreLike | None = None,
*,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can vendor and use https://github.com/scikit-learn/scikit-learn/blob/e87b32a81c70abed8f2e97483758eb64df8255e9/sklearn/utils/validation.py#L32 to deprecate positional arguments. At least of xarray, it passed just store as a positional argument, but deprecating these doesn't feel like too much work.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like this suggestion. Should we do it in 2.18.3 or 3.0 though?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't have a strong preference here.

IMO, calendar time is more meaningful than version numbers for giving projects time to adapt to changes. So I'd say deprecate it in 3.0, as long as we don't have a hard stance on requiring keyword only for these APIs in 3.0

Comment threadsrc/zarr/core/attributes.py Outdated
Comment threadsrc/zarr/core/group.py Outdated
store_path: StorePath

@property
def store(self) -> Store:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Should we deprecate this, and encourage users to do group.store_path.store?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

github is flagging this conversation as outdated, but regardless: I agree that we should just have either group.store or group.store_path.store. But I'm not a huge fan of store_path actually, so I'd actually favor deprecating that, and going back to v2 behavior where arrays / groups have a store attribute, and the store has a path attribute. But this is just my personal opinion, built from finding group.store_path.store a little weird.

Comment threadsrc/zarr/core/group.py Outdated
return self._async_group.store

@property
def read_only(self) -> bool:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Same question as store.

Should probably add this to AsyncGroup too and update this implementation.

@TomAugspurgerTomAugspurger mentioned this pull request Aug 20, 2024
@jhamman

Copy link
Copy Markdown
Member

@TomAugspurger - this generally looks like a solid set of fixes. Do you have more here or should try to wrap these up?

@TomAugspurger
TomAugspurger marked this pull request as ready for review August 28, 2024 19:24
@TomAugspurgerTomAugspurger changed the title [WIP]: Draft of zarr-python 2.x compatibility changesBasic Zarr-python 2.x compatibility changesSep 3, 2024
Comment threadtests/v3/test_attributes.py Outdated
import zarr.store


def test_put():

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in principle we could test this functionality for other stores. but I also think testing the full product of [array / group features * stores] is excessive. I guess as long as we are confident that we are densely testing the core store APIs across store types, then it's fine to just test something derived from the store APIs on a single store.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I think that in this case it's probably OK, since the test here is focused on the behavior of Attributes. This happens to require a reference to a Group (which requires a Store) but hopefully that interface is sufficiently covered by other tests.

@jhammanjhamman added the V3 label Sep 13, 2024
@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I've confirmed that #2157 fixes the CI failure here.

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @TomAugspurger for pulling these together. Much improved compatibility with v2.

@jhamman
jhamman merged commit 6900754 into zarr-developers:v3Sep 20, 2024
@TomAugspurger
TomAugspurger deleted the user/tom/fix/v2-compat branch September 20, 2024 15:02
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
@jhammanjhamman added this to the 3.0.0.beta milestone Oct 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@TomAugspurger@jhamman@d-v-b
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Basic Zarr-python 2.x compatibility changes - #2098

Merged
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat
Sep 20, 2024
Merged

Basic Zarr-python 2.x compatibility changes#2098
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

Demonstration of some changes for backwards compatibility being discussed at #2097

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)


@classmethod
async def create(
async def from_store(

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

In 2.x, Group.create was used to create an array in the Group.

I slightly prefer from_* for alternative constructors anyway, so maybe this is a strict improvement and not just a compatibility shim?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree that this needs to change in order to avoid confusion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i'm also a fan of from_X, and from_store seems good

def open(
*,
store: StoreLike | None = None,
*,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can vendor and use https://github.com/scikit-learn/scikit-learn/blob/e87b32a81c70abed8f2e97483758eb64df8255e9/sklearn/utils/validation.py#L32 to deprecate positional arguments. At least of xarray, it passed just store as a positional argument, but deprecating these doesn't feel like too much work.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like this suggestion. Should we do it in 2.18.3 or 3.0 though?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't have a strong preference here.

IMO, calendar time is more meaningful than version numbers for giving projects time to adapt to changes. So I'd say deprecate it in 3.0, as long as we don't have a hard stance on requiring keyword only for these APIs in 3.0

Comment threadsrc/zarr/core/attributes.py Outdated
Comment threadsrc/zarr/core/group.py Outdated
store_path: StorePath

@property
def store(self) -> Store:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Should we deprecate this, and encourage users to do group.store_path.store?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

github is flagging this conversation as outdated, but regardless: I agree that we should just have either group.store or group.store_path.store. But I'm not a huge fan of store_path actually, so I'd actually favor deprecating that, and going back to v2 behavior where arrays / groups have a store attribute, and the store has a path attribute. But this is just my personal opinion, built from finding group.store_path.store a little weird.

Comment threadsrc/zarr/core/group.py Outdated
return self._async_group.store

@property
def read_only(self) -> bool:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Same question as store.

Should probably add this to AsyncGroup too and update this implementation.

@TomAugspurgerTomAugspurger mentioned this pull request Aug 20, 2024
@jhamman

Copy link
Copy Markdown
Member

@TomAugspurger - this generally looks like a solid set of fixes. Do you have more here or should try to wrap these up?

@TomAugspurger
TomAugspurger marked this pull request as ready for review August 28, 2024 19:24
@TomAugspurgerTomAugspurger changed the title [WIP]: Draft of zarr-python 2.x compatibility changesBasic Zarr-python 2.x compatibility changesSep 3, 2024
Comment threadtests/v3/test_attributes.py Outdated
import zarr.store


def test_put():

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in principle we could test this functionality for other stores. but I also think testing the full product of [array / group features * stores] is excessive. I guess as long as we are confident that we are densely testing the core store APIs across store types, then it's fine to just test something derived from the store APIs on a single store.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I think that in this case it's probably OK, since the test here is focused on the behavior of Attributes. This happens to require a reference to a Group (which requires a Store) but hopefully that interface is sufficiently covered by other tests.

@jhammanjhamman added the V3 label Sep 13, 2024
@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I've confirmed that #2157 fixes the CI failure here.

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @TomAugspurger for pulling these together. Much improved compatibility with v2.

@jhamman
jhamman merged commit 6900754 into zarr-developers:v3Sep 20, 2024
@TomAugspurger
TomAugspurger deleted the user/tom/fix/v2-compat branch September 20, 2024 15:02
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
@jhammanjhamman added this to the 3.0.0.beta milestone Oct 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@TomAugspurger@jhamman@d-v-b
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Basic Zarr-python 2.x compatibility changes - #2098

Merged
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat
Sep 20, 2024
Merged

Basic Zarr-python 2.x compatibility changes#2098
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

Demonstration of some changes for backwards compatibility being discussed at #2097

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)


@classmethod
async def create(
async def from_store(

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

In 2.x, Group.create was used to create an array in the Group.

I slightly prefer from_* for alternative constructors anyway, so maybe this is a strict improvement and not just a compatibility shim?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree that this needs to change in order to avoid confusion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i'm also a fan of from_X, and from_store seems good

def open(
*,
store: StoreLike | None = None,
*,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can vendor and use https://github.com/scikit-learn/scikit-learn/blob/e87b32a81c70abed8f2e97483758eb64df8255e9/sklearn/utils/validation.py#L32 to deprecate positional arguments. At least of xarray, it passed just store as a positional argument, but deprecating these doesn't feel like too much work.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like this suggestion. Should we do it in 2.18.3 or 3.0 though?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't have a strong preference here.

IMO, calendar time is more meaningful than version numbers for giving projects time to adapt to changes. So I'd say deprecate it in 3.0, as long as we don't have a hard stance on requiring keyword only for these APIs in 3.0

Comment threadsrc/zarr/core/attributes.py Outdated
Comment threadsrc/zarr/core/group.py Outdated
store_path: StorePath

@property
def store(self) -> Store:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Should we deprecate this, and encourage users to do group.store_path.store?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

github is flagging this conversation as outdated, but regardless: I agree that we should just have either group.store or group.store_path.store. But I'm not a huge fan of store_path actually, so I'd actually favor deprecating that, and going back to v2 behavior where arrays / groups have a store attribute, and the store has a path attribute. But this is just my personal opinion, built from finding group.store_path.store a little weird.

Comment threadsrc/zarr/core/group.py Outdated
return self._async_group.store

@property
def read_only(self) -> bool:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Same question as store.

Should probably add this to AsyncGroup too and update this implementation.

@TomAugspurgerTomAugspurger mentioned this pull request Aug 20, 2024
@jhamman

Copy link
Copy Markdown
Member

@TomAugspurger - this generally looks like a solid set of fixes. Do you have more here or should try to wrap these up?

@TomAugspurger
TomAugspurger marked this pull request as ready for review August 28, 2024 19:24
@TomAugspurgerTomAugspurger changed the title [WIP]: Draft of zarr-python 2.x compatibility changesBasic Zarr-python 2.x compatibility changesSep 3, 2024
Comment threadtests/v3/test_attributes.py Outdated
import zarr.store


def test_put():

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in principle we could test this functionality for other stores. but I also think testing the full product of [array / group features * stores] is excessive. I guess as long as we are confident that we are densely testing the core store APIs across store types, then it's fine to just test something derived from the store APIs on a single store.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I think that in this case it's probably OK, since the test here is focused on the behavior of Attributes. This happens to require a reference to a Group (which requires a Store) but hopefully that interface is sufficiently covered by other tests.

@jhammanjhamman added the V3 label Sep 13, 2024
@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I've confirmed that #2157 fixes the CI failure here.

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @TomAugspurger for pulling these together. Much improved compatibility with v2.

@jhamman
jhamman merged commit 6900754 into zarr-developers:v3Sep 20, 2024
@TomAugspurger
TomAugspurger deleted the user/tom/fix/v2-compat branch September 20, 2024 15:02
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
@jhammanjhamman added this to the 3.0.0.beta milestone Oct 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@TomAugspurger@jhamman@d-v-b
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Basic Zarr-python 2.x compatibility changes - #2098

Merged
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat
Sep 20, 2024
Merged

Basic Zarr-python 2.x compatibility changes#2098
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

Demonstration of some changes for backwards compatibility being discussed at #2097

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)


@classmethod
async def create(
async def from_store(

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

In 2.x, Group.create was used to create an array in the Group.

I slightly prefer from_* for alternative constructors anyway, so maybe this is a strict improvement and not just a compatibility shim?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree that this needs to change in order to avoid confusion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i'm also a fan of from_X, and from_store seems good

def open(
*,
store: StoreLike | None = None,
*,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can vendor and use https://github.com/scikit-learn/scikit-learn/blob/e87b32a81c70abed8f2e97483758eb64df8255e9/sklearn/utils/validation.py#L32 to deprecate positional arguments. At least of xarray, it passed just store as a positional argument, but deprecating these doesn't feel like too much work.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like this suggestion. Should we do it in 2.18.3 or 3.0 though?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't have a strong preference here.

IMO, calendar time is more meaningful than version numbers for giving projects time to adapt to changes. So I'd say deprecate it in 3.0, as long as we don't have a hard stance on requiring keyword only for these APIs in 3.0

Comment threadsrc/zarr/core/attributes.py Outdated
Comment threadsrc/zarr/core/group.py Outdated
store_path: StorePath

@property
def store(self) -> Store:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Should we deprecate this, and encourage users to do group.store_path.store?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

github is flagging this conversation as outdated, but regardless: I agree that we should just have either group.store or group.store_path.store. But I'm not a huge fan of store_path actually, so I'd actually favor deprecating that, and going back to v2 behavior where arrays / groups have a store attribute, and the store has a path attribute. But this is just my personal opinion, built from finding group.store_path.store a little weird.

Comment threadsrc/zarr/core/group.py Outdated
return self._async_group.store

@property
def read_only(self) -> bool:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Same question as store.

Should probably add this to AsyncGroup too and update this implementation.

@TomAugspurgerTomAugspurger mentioned this pull request Aug 20, 2024
@jhamman

Copy link
Copy Markdown
Member

@TomAugspurger - this generally looks like a solid set of fixes. Do you have more here or should try to wrap these up?

@TomAugspurger
TomAugspurger marked this pull request as ready for review August 28, 2024 19:24
@TomAugspurgerTomAugspurger changed the title [WIP]: Draft of zarr-python 2.x compatibility changesBasic Zarr-python 2.x compatibility changesSep 3, 2024
Comment threadtests/v3/test_attributes.py Outdated
import zarr.store


def test_put():

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in principle we could test this functionality for other stores. but I also think testing the full product of [array / group features * stores] is excessive. I guess as long as we are confident that we are densely testing the core store APIs across store types, then it's fine to just test something derived from the store APIs on a single store.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I think that in this case it's probably OK, since the test here is focused on the behavior of Attributes. This happens to require a reference to a Group (which requires a Store) but hopefully that interface is sufficiently covered by other tests.

@jhammanjhamman added the V3 label Sep 13, 2024
@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I've confirmed that #2157 fixes the CI failure here.

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @TomAugspurger for pulling these together. Much improved compatibility with v2.

@jhamman
jhamman merged commit 6900754 into zarr-developers:v3Sep 20, 2024
@TomAugspurger
TomAugspurger deleted the user/tom/fix/v2-compat branch September 20, 2024 15:02
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
@jhammanjhamman added this to the 3.0.0.beta milestone Oct 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@TomAugspurger@jhamman@d-v-b
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Basic Zarr-python 2.x compatibility changes - #2098

Merged
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat
Sep 20, 2024
Merged

Basic Zarr-python 2.x compatibility changes#2098
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

Demonstration of some changes for backwards compatibility being discussed at #2097

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)


@classmethod
async def create(
async def from_store(

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

In 2.x, Group.create was used to create an array in the Group.

I slightly prefer from_* for alternative constructors anyway, so maybe this is a strict improvement and not just a compatibility shim?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree that this needs to change in order to avoid confusion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i'm also a fan of from_X, and from_store seems good

def open(
*,
store: StoreLike | None = None,
*,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can vendor and use https://github.com/scikit-learn/scikit-learn/blob/e87b32a81c70abed8f2e97483758eb64df8255e9/sklearn/utils/validation.py#L32 to deprecate positional arguments. At least of xarray, it passed just store as a positional argument, but deprecating these doesn't feel like too much work.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like this suggestion. Should we do it in 2.18.3 or 3.0 though?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't have a strong preference here.

IMO, calendar time is more meaningful than version numbers for giving projects time to adapt to changes. So I'd say deprecate it in 3.0, as long as we don't have a hard stance on requiring keyword only for these APIs in 3.0

Comment threadsrc/zarr/core/attributes.py Outdated
Comment threadsrc/zarr/core/group.py Outdated
store_path: StorePath

@property
def store(self) -> Store:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Should we deprecate this, and encourage users to do group.store_path.store?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

github is flagging this conversation as outdated, but regardless: I agree that we should just have either group.store or group.store_path.store. But I'm not a huge fan of store_path actually, so I'd actually favor deprecating that, and going back to v2 behavior where arrays / groups have a store attribute, and the store has a path attribute. But this is just my personal opinion, built from finding group.store_path.store a little weird.

Comment threadsrc/zarr/core/group.py Outdated
return self._async_group.store

@property
def read_only(self) -> bool:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Same question as store.

Should probably add this to AsyncGroup too and update this implementation.

@TomAugspurgerTomAugspurger mentioned this pull request Aug 20, 2024
@jhamman

Copy link
Copy Markdown
Member

@TomAugspurger - this generally looks like a solid set of fixes. Do you have more here or should try to wrap these up?

@TomAugspurger
TomAugspurger marked this pull request as ready for review August 28, 2024 19:24
@TomAugspurgerTomAugspurger changed the title [WIP]: Draft of zarr-python 2.x compatibility changesBasic Zarr-python 2.x compatibility changesSep 3, 2024
Comment threadtests/v3/test_attributes.py Outdated
import zarr.store


def test_put():

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in principle we could test this functionality for other stores. but I also think testing the full product of [array / group features * stores] is excessive. I guess as long as we are confident that we are densely testing the core store APIs across store types, then it's fine to just test something derived from the store APIs on a single store.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I think that in this case it's probably OK, since the test here is focused on the behavior of Attributes. This happens to require a reference to a Group (which requires a Store) but hopefully that interface is sufficiently covered by other tests.

@jhammanjhamman added the V3 label Sep 13, 2024
@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I've confirmed that #2157 fixes the CI failure here.

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @TomAugspurger for pulling these together. Much improved compatibility with v2.

@jhamman
jhamman merged commit 6900754 into zarr-developers:v3Sep 20, 2024
@TomAugspurger
TomAugspurger deleted the user/tom/fix/v2-compat branch September 20, 2024 15:02
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
@jhammanjhamman added this to the 3.0.0.beta milestone Oct 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@TomAugspurger@jhamman@d-v-b
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Basic Zarr-python 2.x compatibility changes - #2098

Merged
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat
Sep 20, 2024
Merged

Basic Zarr-python 2.x compatibility changes#2098
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

Demonstration of some changes for backwards compatibility being discussed at #2097

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)


@classmethod
async def create(
async def from_store(

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

In 2.x, Group.create was used to create an array in the Group.

I slightly prefer from_* for alternative constructors anyway, so maybe this is a strict improvement and not just a compatibility shim?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree that this needs to change in order to avoid confusion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i'm also a fan of from_X, and from_store seems good

def open(
*,
store: StoreLike | None = None,
*,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can vendor and use https://github.com/scikit-learn/scikit-learn/blob/e87b32a81c70abed8f2e97483758eb64df8255e9/sklearn/utils/validation.py#L32 to deprecate positional arguments. At least of xarray, it passed just store as a positional argument, but deprecating these doesn't feel like too much work.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like this suggestion. Should we do it in 2.18.3 or 3.0 though?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't have a strong preference here.

IMO, calendar time is more meaningful than version numbers for giving projects time to adapt to changes. So I'd say deprecate it in 3.0, as long as we don't have a hard stance on requiring keyword only for these APIs in 3.0

Comment threadsrc/zarr/core/attributes.py Outdated
Comment threadsrc/zarr/core/group.py Outdated
store_path: StorePath

@property
def store(self) -> Store:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Should we deprecate this, and encourage users to do group.store_path.store?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

github is flagging this conversation as outdated, but regardless: I agree that we should just have either group.store or group.store_path.store. But I'm not a huge fan of store_path actually, so I'd actually favor deprecating that, and going back to v2 behavior where arrays / groups have a store attribute, and the store has a path attribute. But this is just my personal opinion, built from finding group.store_path.store a little weird.

Comment threadsrc/zarr/core/group.py Outdated
return self._async_group.store

@property
def read_only(self) -> bool:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Same question as store.

Should probably add this to AsyncGroup too and update this implementation.

@TomAugspurgerTomAugspurger mentioned this pull request Aug 20, 2024
@jhamman

Copy link
Copy Markdown
Member

@TomAugspurger - this generally looks like a solid set of fixes. Do you have more here or should try to wrap these up?

@TomAugspurger
TomAugspurger marked this pull request as ready for review August 28, 2024 19:24
@TomAugspurgerTomAugspurger changed the title [WIP]: Draft of zarr-python 2.x compatibility changesBasic Zarr-python 2.x compatibility changesSep 3, 2024
Comment threadtests/v3/test_attributes.py Outdated
import zarr.store


def test_put():

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in principle we could test this functionality for other stores. but I also think testing the full product of [array / group features * stores] is excessive. I guess as long as we are confident that we are densely testing the core store APIs across store types, then it's fine to just test something derived from the store APIs on a single store.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I think that in this case it's probably OK, since the test here is focused on the behavior of Attributes. This happens to require a reference to a Group (which requires a Store) but hopefully that interface is sufficiently covered by other tests.

@jhammanjhamman added the V3 label Sep 13, 2024
@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I've confirmed that #2157 fixes the CI failure here.

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @TomAugspurger for pulling these together. Much improved compatibility with v2.

@jhamman
jhamman merged commit 6900754 into zarr-developers:v3Sep 20, 2024
@TomAugspurger
TomAugspurger deleted the user/tom/fix/v2-compat branch September 20, 2024 15:02
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
@jhammanjhamman added this to the 3.0.0.beta milestone Oct 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@TomAugspurger@jhamman@d-v-b
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Basic Zarr-python 2.x compatibility changes - #2098

Merged
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat
Sep 20, 2024
Merged

Basic Zarr-python 2.x compatibility changes#2098
jhamman merged 31 commits into
zarr-developers:v3from
TomAugspurger:user/tom/fix/v2-compat

Conversation

@TomAugspurger

Copy link
Copy Markdown
Contributor

Demonstration of some changes for backwards compatibility being discussed at #2097

TODO:

  • Add unit tests and/or doctests in docstrings
  • Add docstrings and API docs for any new/modified user-facing classes and functions
  • New/modified features documented in docs/tutorial.rst
  • Changes documented in docs/release.rst
  • GitHub Actions have all passed
  • Test coverage is 100% (Codecov passes)


@classmethod
async def create(
async def from_store(

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

In 2.x, Group.create was used to create an array in the Group.

I slightly prefer from_* for alternative constructors anyway, so maybe this is a strict improvement and not just a compatibility shim?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I agree that this needs to change in order to avoid confusion.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

i'm also a fan of from_X, and from_store seems good

def open(
*,
store: StoreLike | None = None,
*,

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We can vendor and use https://github.com/scikit-learn/scikit-learn/blob/e87b32a81c70abed8f2e97483758eb64df8255e9/sklearn/utils/validation.py#L32 to deprecate positional arguments. At least of xarray, it passed just store as a positional argument, but deprecating these doesn't feel like too much work.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I like this suggestion. Should we do it in 2.18.3 or 3.0 though?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I don't have a strong preference here.

IMO, calendar time is more meaningful than version numbers for giving projects time to adapt to changes. So I'd say deprecate it in 3.0, as long as we don't have a hard stance on requiring keyword only for these APIs in 3.0

Comment threadsrc/zarr/core/attributes.py Outdated
Comment threadsrc/zarr/core/group.py Outdated
store_path: StorePath

@property
def store(self) -> Store:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Should we deprecate this, and encourage users to do group.store_path.store?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

github is flagging this conversation as outdated, but regardless: I agree that we should just have either group.store or group.store_path.store. But I'm not a huge fan of store_path actually, so I'd actually favor deprecating that, and going back to v2 behavior where arrays / groups have a store attribute, and the store has a path attribute. But this is just my personal opinion, built from finding group.store_path.store a little weird.

Comment threadsrc/zarr/core/group.py Outdated
return self._async_group.store

@property
def read_only(self) -> bool:

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Same question as store.

Should probably add this to AsyncGroup too and update this implementation.

@TomAugspurgerTomAugspurger mentioned this pull request Aug 20, 2024
@jhamman

Copy link
Copy Markdown
Member

@TomAugspurger - this generally looks like a solid set of fixes. Do you have more here or should try to wrap these up?

@TomAugspurger
TomAugspurger marked this pull request as ready for review August 28, 2024 19:24
@TomAugspurgerTomAugspurger changed the title [WIP]: Draft of zarr-python 2.x compatibility changesBasic Zarr-python 2.x compatibility changesSep 3, 2024
Comment threadtests/v3/test_attributes.py Outdated
import zarr.store


def test_put():

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

in principle we could test this functionality for other stores. but I also think testing the full product of [array / group features * stores] is excessive. I guess as long as we are confident that we are densely testing the core store APIs across store types, then it's fine to just test something derived from the store APIs on a single store.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I think that in this case it's probably OK, since the test here is focused on the behavior of Attributes. This happens to require a reference to a Group (which requires a Store) but hopefully that interface is sufficiently covered by other tests.

@jhammanjhamman added the V3 label Sep 13, 2024
@TomAugspurger

Copy link
Copy Markdown
ContributorAuthor

I've confirmed that #2157 fixes the CI failure here.

@jhammanjhamman left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @TomAugspurger for pulling these together. Much improved compatibility with v2.

@jhamman
jhamman merged commit 6900754 into zarr-developers:v3Sep 20, 2024
@TomAugspurger
TomAugspurger deleted the user/tom/fix/v2-compat branch September 20, 2024 15:02
dcherian added a commit to dcherian/zarr-python that referenced this pull request Sep 24, 2024
* v3:
chore: update pre-commit hooks (zarr-developers#2222)
fix: validate v3 dtypes when loading/creating v3 metadata (zarr-developers#2209)
fix typo in store integration test (zarr-developers#2223)
Basic Zarr-python 2.x compatibility changes (zarr-developers#2098)
Make Group.arrays, groups compatible with v2 (zarr-developers#2213)
Typing fixes to test_indexing (zarr-developers#2193)
Default to RemoteStore for fsspec URIs (zarr-developers#2198)
Make MemoryStore serialiazable (zarr-developers#2204)
[v3] Implement Group methods for empty, full, ones, and zeros (zarr-developers#2210)
implement `store.list_prefix` and `store._set_many` (zarr-developers#2064)
Fixed codec for v2 data with no fill value (zarr-developers#2207)
@jhammanjhamman added this to the 3.0.0.beta milestone Oct 17, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants

@TomAugspurger@jhamman@d-v-b