Updated to v3.0.24.3

.gitignore

@@ -7,3 +7,7 @@ config/**
 !config/*default*
 !config/*calibrated*
 !config/symbology/
+.vscode/
+**/.DS_Store
+**/*_pytest.py
+

.isort.cfg

@@ -0,0 +1,3 @@
+[tool.isort]
+profile = "black"
+multi_line_output = 3

Dockerfile.dev → Dockerfile

@@ -4,19 +4,18 @@ WORKDIR /opt/builder
 ARG dataDir=/data
 ARG projectDir=/foss_fim
 ARG depDir=/dependencies
-ARG taudemVersion=bf9417172225a9ce2462f11138c72c569c253a1a
+ARG taudemVersion=98137bb6541a0d0077a9c95becfed4e56d0aa0ac
 ARG taudemVersion2=81f7a07cdd3721617a30ee4e087804fddbcffa88
-ENV DEBIAN_FRONTEND noninteractive
 ENV taudemDir=$depDir/taudem/bin
 ENV taudemDir2=$depDir/taudem_accelerated_flowDirections/taudem/build/bin
 
-RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/* 
+RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
 
 RUN git clone https://github.com/dtarb/taudem.git
 RUN git clone https://github.com/fernandoa123/cybergis-toolkit.git taudem_accelerated_flowDirections
 
-RUN apt-get update && apt-get install -y cmake mpich \
- libgtest-dev libboost-test-dev libnetcdf-dev && rm -rf /var/lib/apt/lists/* 
+RUN apt-get update --fix-missing && apt-get install -y cmake mpich \
+ libgtest-dev libboost-test-dev libnetcdf-dev && rm -rf /var/lib/apt/lists/*
 
 ## Compile Main taudem repo ##
 RUN mkdir -p taudem/bin
@@ -53,8 +52,8 @@ ARG dataDir=/data
 ARG projectDir=/foss_fim
 ARG depDir=/dependencies
 ENV inputDataDir=$dataDir/inputs
-ENV outputDataDir=$dataDir/outputs 
-ENV libDir=$projectDir/lib
+ENV outputDataDir=$dataDir/outputs
+ENV srcDir=$projectDir/src
 ENV taudemDir=$depDir/taudem/bin
 ENV taudemDir2=$depDir/taudem_accelerated_flowDirections/taudem/build/bin
 
@@ -71,11 +70,9 @@ RUN mkdir -p $depDir
 COPY --from=builder $depDir $depDir
 
 
-RUN apt update --fix-missing
-RUN apt install -y p7zip-full python3-pip time mpich=3.3.2-2build1 parallel=20161222-1.1 libgeos-dev=3.8.0-1build1 expect=5.45.4-2build1
+RUN apt update --fix-missing && apt install -y p7zip-full python3-pip time mpich=3.3.2-2build1 parallel=20161222-1.1 libgeos-dev=3.8.0-1build1 expect=5.45.4-2build1
 
-COPY install_grass.exp .
-RUN ./install_grass.exp
+RUN DEBIAN_FRONTEND=noninteractive apt install -y grass=7.8.2-1build3 grass-doc=7.8.2-1build3
 
 RUN apt auto-remove
 
@@ -93,5 +90,5 @@ COPY Pipfile.lock .
 RUN pip3 install pipenv && PIP_NO_CACHE_DIR=off PIP_NO_BINARY=shapely,pygeos pipenv install --system --deploy --ignore-pipfile
 
 ## RUN UMASK TO CHANGE DEFAULT PERMISSIONS ##
-ADD ./lib/entrypoint.sh /
+ADD ./src/entrypoint.sh /
 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]

Pipfile

@@ -7,6 +7,7 @@ verify_ssl = true
 ipython = "*"
 
 [packages]
+fiona = "==1.8.17"
 geopandas = "==0.8.1"
 numba = "==0.50.1"
 pandas = "==1.0.5"
@@ -18,6 +19,10 @@ tqdm = "==4.48.0"
 Shapely = "==1.7.0"
 grass-session = "==0.5"
 seaborn = "==0.11.0"
+python-dotenv = "*"
+natsort = "*"
+memory-profiler = "*"
+pyproj = "==3.1.0"
 
 [requires]
 python_version = "3.8"