From 480c64aeff649ad42e9d19bc3cea09b7725fa1b8 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Fri, 7 Jul 2023 16:17:12 +1000 Subject: [PATCH 1/3] use versions compatible with pydantic v2 --- ci/environment-3.10.yml | 6 ++---- ci/environment-3.11.yml | 6 ++---- ci/environment-3.9.yml | 6 ++---- pyproject.toml | 4 ++-- src/access_nri_intake/source/builders.py | 2 +- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/ci/environment-3.10.yml b/ci/environment-3.10.yml index 4678efee..1fcb2c0d 100644 --- a/ci/environment-3.10.yml +++ b/ci/environment-3.10.yml @@ -6,14 +6,12 @@ channels: dependencies: - python==3.10 - cftime - - ecgtools>=2022.10.07 - - fsspec<=2023.5.0 # see https://github.com/ncar-xdev/ecgtools/issues/160 + - ecgtools>=2023.7.?? - intake-dataframe-catalog>=0.1.1 - - intake-esm>=2023.4.20 + - intake-esm>=2023.7.?? - jsonschema - pooch - pre-commit - - pydantic<2.0 # see https://github.com/intake/intake-esm/issues/617, https://github.com/ncar-xdev/ecgtools/issues /161 - pytest - xarray - pip diff --git a/ci/environment-3.11.yml b/ci/environment-3.11.yml index 87da8f3d..8acbedad 100644 --- a/ci/environment-3.11.yml +++ b/ci/environment-3.11.yml @@ -6,14 +6,12 @@ channels: dependencies: - python==3.11 - cftime - - ecgtools>=2022.10.07 - - fsspec<=2023.5.0 # see https://github.com/ncar-xdev/ecgtools/issues/160 + - ecgtools>=2023.7.?? - intake-dataframe-catalog>=0.1.1 - - intake-esm>=2023.4.20 + - intake-esm>=2023.7.?? - jsonschema - pooch - pre-commit - - pydantic<2.0 # see https://github.com/intake/intake-esm/issues/617, https://github.com/ncar-xdev/ecgtools/issues/161 - pytest - xarray - pip diff --git a/ci/environment-3.9.yml b/ci/environment-3.9.yml index 3e757d37..031981b2 100644 --- a/ci/environment-3.9.yml +++ b/ci/environment-3.9.yml @@ -6,14 +6,12 @@ channels: dependencies: - python>=3.9.2 # see https://github.com/dask/distributed/issues/7956 - cftime - - ecgtools>=2022.10.07 - - fsspec<=2023.5.0 # see https://github.com/ncar-xdev/ecgtools/issues/160 + - ecgtools>=2023.7.?? - intake-dataframe-catalog>=0.1.1 - - intake-esm>=2023.4.20 + - intake-esm>=2023.7.?? - jsonschema - pooch - pre-commit - - pydantic<2.0 # see https://github.com/intake/intake-esm/issues/617, https://github.com/ncar-xdev/ecgtools/issues /161 - pytest - xarray - pip diff --git a/pyproject.toml b/pyproject.toml index d0b8a1f1..92a2276e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,10 +15,10 @@ classifiers = [ ] dependencies = [ "cftime", - "ecgtools>=2022.10.07", + "ecgtools>=2023.7.??", "intake>=0.7.0", "intake-dataframe-catalog>=0.2.2", - "intake-esm>=2023.4.20", + "intake-esm>=2023.7.??", "jsonschema", "pooch", "xarray", diff --git a/src/access_nri_intake/source/builders.py b/src/access_nri_intake/source/builders.py index 3ef7fd72..acd1e725 100644 --- a/src/access_nri_intake/source/builders.py +++ b/src/access_nri_intake/source/builders.py @@ -76,7 +76,7 @@ def __init__( self.storage_options = storage_options self.joblib_parallel_kwargs = joblib_parallel_kwargs - super().__post_init_post_parse__() + super().__post_init__() def _parse(self): super().parse(parsing_func=self.parser) From 723b92ecd589c75eb661fec47183f9d089d1bd6c Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Mon, 10 Jul 2023 13:04:58 +1000 Subject: [PATCH 2/3] conda dependencies --- .conda/meta.yaml | 4 ++-- ci/environment-3.10.yml | 6 +++--- ci/environment-3.11.yml | 6 +++--- ci/environment-3.9.yml | 6 +++--- pyproject.toml | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.conda/meta.yaml b/.conda/meta.yaml index ad37cb80..682b4f39 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -21,10 +21,10 @@ requirements: run: - python >=3.9 - cftime - - ecgtools>=2022.10.07 + - ecgtools>=2023.7.7 - intake>=0.7.0 - intake-dataframe-catalog>=0.2.2 - - intake-esm>=2023.4.20 + - intake-esm>=2023.7.7 - jsonschema - pooch - xarray diff --git a/ci/environment-3.10.yml b/ci/environment-3.10.yml index 1fcb2c0d..33afd29c 100644 --- a/ci/environment-3.10.yml +++ b/ci/environment-3.10.yml @@ -6,9 +6,9 @@ channels: dependencies: - python==3.10 - cftime - - ecgtools>=2023.7.?? - - intake-dataframe-catalog>=0.1.1 - - intake-esm>=2023.7.?? + - ecgtools>=2023.7.7 + - intake-dataframe-catalog>=0.2.2 + - intake-esm>=2023.7.7 - jsonschema - pooch - pre-commit diff --git a/ci/environment-3.11.yml b/ci/environment-3.11.yml index 8acbedad..fd4341c0 100644 --- a/ci/environment-3.11.yml +++ b/ci/environment-3.11.yml @@ -6,9 +6,9 @@ channels: dependencies: - python==3.11 - cftime - - ecgtools>=2023.7.?? - - intake-dataframe-catalog>=0.1.1 - - intake-esm>=2023.7.?? + - ecgtools>=2023.7.7 + - intake-dataframe-catalog>=0.2.2 + - intake-esm>=2023.7.7 - jsonschema - pooch - pre-commit diff --git a/ci/environment-3.9.yml b/ci/environment-3.9.yml index 031981b2..1c850aaa 100644 --- a/ci/environment-3.9.yml +++ b/ci/environment-3.9.yml @@ -6,9 +6,9 @@ channels: dependencies: - python>=3.9.2 # see https://github.com/dask/distributed/issues/7956 - cftime - - ecgtools>=2023.7.?? - - intake-dataframe-catalog>=0.1.1 - - intake-esm>=2023.7.?? + - ecgtools>=2023.7.7 + - intake-dataframe-catalog>=0.2.2 + - intake-esm>=2023.7.7 - jsonschema - pooch - pre-commit diff --git a/pyproject.toml b/pyproject.toml index 92a2276e..0ecf0676 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,10 +15,10 @@ classifiers = [ ] dependencies = [ "cftime", - "ecgtools>=2023.7.??", + "ecgtools>=2023.7.7", "intake>=0.7.0", "intake-dataframe-catalog>=0.2.2", - "intake-esm>=2023.7.??", + "intake-esm>=2023.7.7", "jsonschema", "pooch", "xarray", From 5ddd3991e26674dd1227c9585f861f42c989b8a1 Mon Sep 17 00:00:00 2001 From: Dougie Squire Date: Tue, 18 Jul 2023 16:23:12 +1000 Subject: [PATCH 3/3] update ecgtools version --- .conda/meta.yaml | 2 +- ci/environment-3.10.yml | 2 +- ci/environment-3.11.yml | 2 +- ci/environment-3.9.yml | 2 +- pyproject.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.conda/meta.yaml b/.conda/meta.yaml index 682b4f39..704050c6 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -21,7 +21,7 @@ requirements: run: - python >=3.9 - cftime - - ecgtools>=2023.7.7 + - ecgtools>=2023.7.13 - intake>=0.7.0 - intake-dataframe-catalog>=0.2.2 - intake-esm>=2023.7.7 diff --git a/ci/environment-3.10.yml b/ci/environment-3.10.yml index 33afd29c..897cfbca 100644 --- a/ci/environment-3.10.yml +++ b/ci/environment-3.10.yml @@ -6,7 +6,7 @@ channels: dependencies: - python==3.10 - cftime - - ecgtools>=2023.7.7 + - ecgtools>=2023.7.13 - intake-dataframe-catalog>=0.2.2 - intake-esm>=2023.7.7 - jsonschema diff --git a/ci/environment-3.11.yml b/ci/environment-3.11.yml index fd4341c0..7735008c 100644 --- a/ci/environment-3.11.yml +++ b/ci/environment-3.11.yml @@ -6,7 +6,7 @@ channels: dependencies: - python==3.11 - cftime - - ecgtools>=2023.7.7 + - ecgtools>=2023.7.13 - intake-dataframe-catalog>=0.2.2 - intake-esm>=2023.7.7 - jsonschema diff --git a/ci/environment-3.9.yml b/ci/environment-3.9.yml index 1c850aaa..2cb1658f 100644 --- a/ci/environment-3.9.yml +++ b/ci/environment-3.9.yml @@ -6,7 +6,7 @@ channels: dependencies: - python>=3.9.2 # see https://github.com/dask/distributed/issues/7956 - cftime - - ecgtools>=2023.7.7 + - ecgtools>=2023.7.13 - intake-dataframe-catalog>=0.2.2 - intake-esm>=2023.7.7 - jsonschema diff --git a/pyproject.toml b/pyproject.toml index 0ecf0676..ec237cbb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ classifiers = [ ] dependencies = [ "cftime", - "ecgtools>=2023.7.7", + "ecgtools>=2023.7.13", "intake>=0.7.0", "intake-dataframe-catalog>=0.2.2", "intake-esm>=2023.7.7",