Merge branch 'release/5.1.0'

WikiWatershed · Jan 4, 2022 · 1fa68fa · 1fa68fa
2 parents a05340b + bd8d49d
commit 1fa68fa
Show file tree

Hide file tree

Showing 8 changed files with 8,329 additions and 87 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 5.1.0
+
+- Increase timeout to 2 minutes, as the new Hi Res Streams can
+  easily exceed the 1 minute limit.
+
 ## 5.0.0
 
 - Update `/multi` endpoint to take the same format of stream data

diff --git a/api/src/main/resources/application.conf b/api/src/main/resources/application.conf
@@ -6,7 +6,8 @@ geoprocessing {
 
 akka.http {
   server {
-    request-timeout = 59 s
+    idle-timeout = 121 s
+    request-timeout = 120 s
   }
   parsing {
     max-content-length = 50m

diff --git a/examples/MultiOperationRequestHiResStreams.json b/examples/MultiOperationRequestHiResStreams.json
diff --git a/project/build.scala b/project/build.scala
@@ -30,7 +30,7 @@ object Geoprocessing extends Build {
     super.settings ++
   Seq(
     shellPrompt := { s => Project.extract(s).currentProject.id + " > " },
-    version := "5.0.0",
+    version := "5.1.0",
     scalaVersion := Version.scala,
     organization := "org.wikiwatershed.mmw.geoprocessing",
     name := "mmw-geoprocessing",

diff --git a/scripts/Pipfile b/scripts/Pipfile
@@ -7,9 +7,9 @@ name = "pypi"
 
 [packages]
 
-requests = "==2.20.0"
-aiohttp = "==3.0.9"
-backoff = "==1.4.3"
+requests = "==2.26.0"
+aiohttp = "==3.8.0"
+backoff = "==1.11.1"
 
 
 [dev-packages]

diff --git a/scripts/Pipfile.lock b/scripts/Pipfile.lock
diff --git a/scripts/benchmark-sync b/scripts/benchmark-sync
@@ -24,7 +24,7 @@ huc12_file = 'RasterGroupedCount_LittleNeshaminy_HUC12.json'
 rga_file = 'RasterGroupedAverage.json'
 rlj_file = 'RasterLinesJoin_Schuylkill_HUC08.json'
 rs_file = 'RasterSummary_Schuylkill_HUC08.json'
-multi_subbasin_file = 'MultiOperationRequest.json'
+multi_subbasin_file = 'MultiOperationRequestHiResStreams.json'
 multi_mapshed_file = 'MultiOperationRequestHUC8.json'
 
 def make_multi_request(input_file, operation_name):

diff --git a/scripts/benchmarking_input_data/MultiOperationRequestHiResStreams.json b/scripts/benchmarking_input_data/MultiOperationRequestHiResStreams.json
@@ -0,0 +1 @@
+../../examples/MultiOperationRequestHiResStreams.json
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../examples/MultiOperationRequestHiResStreams.json