Skip to content

Commit

Permalink
remove fiona dep, require non-dev geopandas
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshCu committed Sep 3, 2024
1 parent 9d9d711 commit 638f6f0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
sudo apt-get install libstdc++-10-dev libgfortran-10-dev glibc-source openmpi-bin openmpi-common libopenmpi-dev libopenmpi3 libgtk-3-bin libgtk-3-common libgtk-3-dev -y
sudo apt-get install netcdf-bin libnetcdf-dev libnetcdff-dev libnetcdf-c++4 libnetcdf-c++4-dev -y
python -m pip install --upgrade pip
pip3 install wheel dask pyproj fiona bmipy opencv-contrib-python-headless
pip3 install wheel dask pyproj bmipy opencv-contrib-python-headless
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
- name: Install t-route
Expand Down
3 changes: 1 addition & 2 deletions src/troute-network/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ name = "troute.network"
version = "0.0.0"
dependencies = [
"deprecated",
"geopandas",
"fiona",
"geopandas>=1.0.0",
"joblib",
"netcdf4",
"numpy",
Expand Down
4 changes: 1 addition & 3 deletions src/troute-network/troute/HYFeaturesNetwork.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
from joblib import delayed, Parallel
from collections import defaultdict
import xarray as xr
from datetime import datetime
from pprint import pformat
import os
import fiona
import troute.nhd_io as nhd_io #FIXME
from troute.nhd_network import reverse_dict, extract_connections, reverse_network, reachable
from .rfc_lake_gage_crosswalk import get_rfc_lake_gage_crosswalk, get_great_lakes_climatology
Expand All @@ -32,7 +30,7 @@ def find_layer_name(layers, pattern):

def read_geopkg(file_path, compute_parameters, waterbody_parameters, cpu_pool):
# Retrieve available layers from the GeoPackage
available_layers = fiona.listlayers(file_path)
available_layers = gpd.list_layers(file_path)

# patterns for the layers we want to find
layer_patterns = {
Expand Down

0 comments on commit 638f6f0

Please sign in to comment.