Skip to content

Fix merge conflicts for V3 typing any generics #1

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

Merged

Conversation

d-v-b
Copy link

@d-v-b d-v-b commented Apr 22, 2024

This handles merge conflicts introduced by recent commits into the v3 branch.

Charoula-Kyriakides and others added 4 commits April 21, 2024 13:22
* LocalStore__eq__ zarr-developers#1744

Fix equality comparison in LocalStore class by implementing __eq__ method

* Update src/zarr/v3/store/local.py

Changed 'LocalStore' to object in __eq__

Co-authored-by: Davis Bennett <[email protected]>

---------

Co-authored-by: Davis Bennett <[email protected]>
* chore: add deprecation warnings to v3 classes / functions

* Resolve Mypy erorrs in `v3` branch (zarr-developers#1692)

* refactor(v3): Using appropriate types

* fix(v3): Typing fixes + minor code fixes

* fix(v3): _sync_iter works with coroutines

* docs(v3/store/core.py): clearer comment

* fix(metadata.py): Use Any outside TYPE_CHECKING for Pydantic

* fix(zarr/v3): correct zarr format + remove unused method

* fix(v3/store/core.py): Potential suggestion on handling str store_like

* refactor(zarr/v3): Add more typing

* ci(.pre-commit-config.yaml): zarr v3 mypy checks turned on in pre-commit

* Specify hatch envs using GitHub actions matrix for v3 tests (zarr-developers#1728)

* Specify v3 hatch envs using GitHub actions matrix

* Update .github/workflows/test-v3.yml

Co-authored-by: Joe Hamman <[email protected]>

* Update .github/workflows/test-v3.yml

Co-authored-by: Joe Hamman <[email protected]>

* test on 3.12 too

* no 3.12

---------

Co-authored-by: Joe Hamman <[email protected]>
Co-authored-by: Joe Hamman <[email protected]>

* black -> ruff format + cleanup (zarr-developers#1639)

* black -> ruff + cleanup

* format

* Preserve git blame

* pre-commit fix

* Remove outdated dev install docs from installation.rst and link to contributing.rst (zarr-developers#1643)

Co-authored-by: Joe Hamman <[email protected]>

* chore: remove old v3 implementation

* chore: remove more version-conditional logic

* chore: remove v3_storage_transformers.py again

---------

Co-authored-by: Daniel Jahn (dahn) <[email protected]>
Co-authored-by: Max Jones <[email protected]>
Co-authored-by: Joe Hamman <[email protected]>
Co-authored-by: Joe Hamman <[email protected]>
Co-authored-by: Saransh Chopra <[email protected]>
Co-authored-by: Alden Keefe Sampson <[email protected]>
@dstansby dstansby merged commit ed92fe6 into dstansby:v3-typing-any-generics Apr 22, 2024
1 check passed
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.

4 participants