Merge pull request #11 from supathdhitalGEO/main

adding workflows to build and test the code for packaging

Author: supathdhitalGEO

.github/workflows/python-publish.yml

@@ -0,0 +1,52 @@
+# GitHub Actions workflow to build, test, and upload a Python package to PyPI
+
+name: Package Build and Test
+
+on:
+  push:
+    branches:
+      - main 
+
+permissions:
+  contents: write
+
+jobs:
+  release-build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Build release distributions
+        run: |
+          python -m pip install build
+          python -m build
+
+      - name: Upload distributions
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+  # pypi-publish:
+  #   runs-on: ubuntu-latest
+  #   # needs: test-build  
+
+  #   permissions:
+  #     id-token: write  
+
+  #   steps:
+  #     - name: Retrieve built distributions
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: release-dists
+  #         path: dist/
+
+  #     - name: Publish package to PyPI
+  #       uses: pypa/gh-action-pypi-publish@release/v1
+  #       with:
+  #         packages-dir: dist/

README.md

@@ -7,6 +7,7 @@
 [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Fsdmlua%2FFIMserv&count_bg=%231A93AE&title_bg=%23E48A8A&icon=clyp.svg&icon_color=%23E7E7E7&title=Views&edge_flat=false)](https://hits.seeyoufarm.com)
 [![PyPI version](https://badge.fury.io/py/fimserve.svg?icon=si%3Apython)](https://badge.fury.io/py/fimserve)
 [![PyPI Downloads](https://static.pepy.tech/badge/fimserve)](https://pepy.tech/projects/fimserve)
+[![Publish Status](https://github.com/sdmlua/FIMserv/actions/workflows/python-publish.yml/badge.svg)](https://github.com/sdmlua/FIMserv/actions/workflows/python-publish.yml)
 
 
 

dist/fimserve-0.1.72-py3-none-any.whl

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fimserve"
-version = "0.1.71"
+version = "0.1.72"
 description = "Framework which is developed with the purpose of quickly generating Flood Inundation Maps (FIM) for emergency response and risk assessment. It is developed under Surface Dynamics Modeling Lab (SDML)."
 authors = ["Supath Dhital <[email protected]>"]
 license = "GPL-3.0"

dist/fimserve-0.1.72.tar.gz

@@ -121,7 +121,7 @@ def processnetCDF(netcdf_file_path, filter_df, output_folder_path):
     merged_df.to_csv(output_csv_file_path, index=False)
 
 
-def ProcessForecasts(CSVFILES, forecast_date, hour, forecast_range, sort_by, data_dir):
+def ProcessForecasts(CSVFILES, forecast_date, hour, forecast_range, sort_by, data_dir, huc):
     merge_folder = os.path.join(CSVFILES, "mergedAndSorted")
     os.makedirs(merge_folder, exist_ok=True)
 
@@ -173,7 +173,7 @@ def ProcessForecasts(CSVFILES, forecast_date, hour, forecast_range, sort_by, dat
                     "%Y%m%d"
                 )
 
-                sorted_file_name = f"{forecast_range}_{adjusted_date}_{adjusted_forecast_hour:02d}UTC.csv"
+                sorted_file_name = f"{forecast_range}_{huc}_{adjusted_date}_{adjusted_forecast_hour:02d}UTC.csv"
                 sorted_file_path = os.path.join(data_dir, sorted_file_name)
                 original_file_path = os.path.join(CSVFILES, csv_file)
                 os.rename(original_file_path, sorted_file_path)
@@ -288,7 +288,7 @@ def main(
         or forecast_range == "shortrange"
     ):
         ProcessForecasts(
-            CSVFILES, forecast_date, hour, forecast_range, sort_by, data_dir
+            CSVFILES, forecast_date, hour, forecast_range, sort_by, data_dir, HUC
         )
         print(f"The final discharge values saved to {data_dir}")
         try: