Merge pull request #103 from ACCESS-NRI/102_pydantic_update

Update for pydantic v2 compatibility
ACCESS-NRI · Jul 18, 2023 · 405f41c · 405f41c
2 parents 051deb3 + 5ddd399
commit 405f41c
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 20 deletions.
diff --git 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.13
     - 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
@@ -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
-  - intake-dataframe-catalog>=0.1.1
-  - intake-esm>=2023.4.20
+  - ecgtools>=2023.7.13
+  - intake-dataframe-catalog>=0.2.2
+  - intake-esm>=2023.7.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
@@ -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
-  - intake-dataframe-catalog>=0.1.1
-  - intake-esm>=2023.4.20
+  - ecgtools>=2023.7.13
+  - intake-dataframe-catalog>=0.2.2
+  - intake-esm>=2023.7.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
@@ -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
-  - intake-dataframe-catalog>=0.1.1
-  - intake-esm>=2023.4.20
+  - ecgtools>=2023.7.13
+  - intake-dataframe-catalog>=0.2.2
+  - intake-esm>=2023.7.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
@@ -15,10 +15,10 @@ classifiers = [
 ]
 dependencies = [
     "cftime",
-    "ecgtools>=2022.10.07",
+    "ecgtools>=2023.7.13",
     "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/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)