Merge remote-tracking branch 'upstream/dev' into dev

OuyangWenyu · Feb 14, 2024 · ed26a08 · ed26a08
2 parents 2cfeafb + e199c68
commit ed26a08
Show file tree

Hide file tree

Showing 11 changed files with 497 additions and 214 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,9 +2,11 @@ on:
     push:
         branches:
             - main
+            - dev
     pull_request:
         branches:
             - main
+            - dev
 
 name: build
 jobs:
@@ -17,9 +19,6 @@ jobs:
                 config:
                     - { os: windows-latest, py: "3.10" }
                     - { os: macOS-latest, py: "3.10" }
-                    - { os: ubuntu-latest, py: "3.7" }
-                    - { os: ubuntu-latest, py: "3.8" }
-                    - { os: ubuntu-latest, py: "3.9" }
                     - { os: ubuntu-latest, py: "3.10" }
 
         env:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -10,7 +10,7 @@ jobs:
             - uses: actions/checkout@v3
             - uses: actions/setup-python@v4
               with:
-                  python-version: 3.9
+                  python-version: 3.10
             - name: Install dependencies
               run: |
                   python -m pip install --upgrade pip

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -8,15 +8,17 @@ dependencies:
   - pandas
   - matplotlib
   - seaborn
+  # for gis plotting
+  - cartopy
   - tqdm
   - black
   - hydroerr
   - async-retriever
   - rich
   # for s3 access
-  - boto3
+  - boto3=1.28.64
   - minio
-  - s3fs=2022.05
+  - s3fs=2023.10
   # for dev
   - pip
   - bump2version

diff --git a/hydroutils/__init__.py b/hydroutils/__init__.py
@@ -10,6 +10,6 @@
 
 __author__ = """Wenyu Ouyang"""
 __email__ = '[email protected]'
-__version__ = '0.0.4'
+__version__ = '0.0.7'
 
 from .hydro_log import *
diff --git a/hydroutils/hydro_file.py b/hydroutils/hydro_file.py
@@ -177,6 +177,18 @@ def unserialize_json(my_file):
     return my_object
 
 
+class NumpyArrayEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, np.ndarray):
+            return obj.tolist()
+        return json.JSONEncoder.default(self, obj)
+
+
+def serialize_json_np(my_dict, my_file):
+    with open(my_file, "w") as FP:
+        json.dump(my_dict, FP, cls=NumpyArrayEncoder)
+
+
 def serialize_pickle(my_object, my_file):
     with open(my_file, "wb") as f:
         pickle.dump(my_object, f)