Merge pull request dailyerosion#264 from akrherz/240812

Support upcoming expansion

.github/setupdata.sh

@@ -0,0 +1 @@
+touch /i/0/cli/100x042/100.30x042.26.cli

.github/setuppaths.sh

@@ -0,0 +1,8 @@
+# Create necessary paths
+mkdir -p _data/2/0
+mkdir _data/data
+sudo ln -s `pwd`/_data /mnt/idep2
+sudo ln -s `pwd`/_data/2 /i
+sudo ln -s `pwd` /opt/dep
+
+mkdir -p /i/0/cli/100x042

.github/workflows/pydep.yml

@@ -11,7 +11,7 @@ jobs:
     defaults:
       run:
         # Ensures environment gets sourced right
-        shell: bash -l {0}
+        shell: bash -e -l {0}
     name: Build and Test
     runs-on: ubuntu-latest
     strategy:
@@ -26,12 +26,6 @@ jobs:
       run: |
         cat .github/workflows/etchosts.txt | sudo tee -a /etc/hosts
 
-    # daryl is a hack
-    - name: Create symlink
-      run: |
-        set -e
-        sudo ln -s `pwd` /opt/dep
-
     # setup conda-forge with micromamba
     - name: Setup Python
       uses: mamba-org/setup-micromamba@v1
@@ -46,6 +40,15 @@ jobs:
         environment-name: prod
         cache-environment: true
 
+    - name: Install Python Dependencies via pip
+      run: python -m pip install -r pip_requirements.txt
+
+    - name: Setup paths
+      run: sh .github/setuppaths.sh
+
+    - name: Setup data
+      run: sh .github/setupdata.sh
+
     - name: Setup Postgres
       run: |
         git clone --depth 1 https://github.com/akrherz/iem-database.git database
@@ -60,7 +63,6 @@ jobs:
   
     - name: Build and test
       run: |
-        set -e
         python -m pip install . --upgrade --no-deps
         python -m pytest --cov=pydep tests
         python -m coverage xml

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.5.7"
+    rev: "v0.6.1"
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

environment.yml

@@ -8,8 +8,6 @@ dependencies:
   # image work
   - pillow
   - psycopg
-  # my hacky
-  - pyiem
   # Fast geojson reading
   - pyogrio
   # For testing

pip_requirements.txt

@@ -1 +1,2 @@
-# none
+# bad daryl
+git+https://github.com/akrherz/pyIEM.git

scripts/RT/env2csv.py

@@ -12,13 +12,14 @@
 import numpy as np
 import pandas as pd
 from affine import Affine
-from pydep.io.wepp import read_env
-from pydep.util import load_scenarios
 from pyiem.iemre import NORTH, WEST
 from pyiem.util import get_dbconn, logger
 from rasterstats import zonal_stats
 from tqdm import tqdm
 
+from pydep.io.wepp import read_env
+from pydep.util import load_scenarios
+
 LOG = logger()
 PRECIP_AFF = Affine(0.01, 0.0, WEST, 0.0, -0.01, NORTH)
 CONFIG = {"subset": False}

scripts/RT/env2database.py

@@ -19,13 +19,14 @@
 import numpy as np
 import pandas as pd
 from affine import Affine
-from pydep.io.dep import read_env
-from pydep.util import load_scenarios
 from pyiem.grid.zs import CachingZonalStats
 from pyiem.iemre import NORTH, WEST
 from pyiem.util import get_dbconn, get_dbconnstr, logger
 from tqdm import tqdm
 
+from pydep.io.dep import read_env
+from pydep.util import load_scenarios
+
 LOG = logger()
 PRECIP_AFF = Affine(0.01, 0.0, WEST, 0.0, -0.01, NORTH)
 CONFIG = {"subset": False}

scripts/RT/harvest2database.py

@@ -9,10 +9,11 @@
 
 # third party
 import pandas as pd
-from pydep.io.wepp import read_yld
 from pyiem.util import get_dbconn
 from tqdm import tqdm
 
+from pydep.io.wepp import read_yld
+
 
 def readfile(huc12, filename):
     """Make me a df please"""

scripts/RT/harvest_wb.py

@@ -9,12 +9,13 @@
 import numpy as np
 import pandas as pd
 from affine import Affine
-from pydep.io.dep import read_wb
 from pyiem.iemre import NORTH, WEST
 from pyiem.util import get_dbconn
 from rasterstats import zonal_stats
 from tqdm import tqdm
 
+from pydep.io.dep import read_wb
+
 PRECIP_AFF = Affine(0.01, 0.0, WEST, 0.0, -0.01, NORTH)
 
 

scripts/RT/proctor_sweep.py

@@ -29,12 +29,13 @@
 import numpy as np
 import pandas as pd
 import requests
-from pydep.io.man import man2df, read_man
 from pyiem.database import get_sqlalchemy_conn
 from pyiem.util import logger
 from sqlalchemy import text
 from tqdm import tqdm
 
+from pydep.io.man import man2df, read_man
+
 HUC12S = ["090201081101", "090201081102", "090201060605"]
 LOG = logger()
 IEMRE = "http://mesonet.agron.iastate.edu/iemre/hourly"

scripts/RT/scenario_compare_event.py

@@ -4,9 +4,10 @@
 import os
 
 import pandas as pd
-from pydep.io.wepp import read_env
 from pyiem.plot.use_agg import plt
 
+from pydep.io.wepp import read_env
+
 
 def main():
     """Go Main Go."""

scripts/cligen/add_clifile.py

@@ -11,9 +11,10 @@
 
 import pandas as pd
 import requests
+from pyiem.util import convert_value, logger
+
 from pydep.io.wepp import read_cli
 from pydep.util import get_cli_fname
-from pyiem.util import convert_value, logger
 
 LOG = logger()
 

scripts/cligen/assign_climate_file.py

@@ -2,9 +2,10 @@
 
 import sys
 
-from pydep.util import get_cli_fname
 from pyiem.util import get_dbconn, logger
 
+from pydep.util import get_cli_fname
+
 LOG = logger()