updated gedi pytest to reflect new gdal sampling code

SlideRuleEarth · Nov 13, 2023 · fa20fcb · fa20fcb
1 parent 3c99860
commit fa20fcb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/clients/python/tests/test_gedi.py b/clients/python/tests/test_gedi.py
@@ -79,7 +79,7 @@ def test_gedi(self, init):
         gdf = icesat2.atl06p(parms, resources=[resource])
         assert init
         assert gdf.describe()["gedi.time"]["std"] == 0.0
-        assert abs(gdf.describe()["gedi.value"]["mean"] - 3142.8526604140434) < 0.001
+        assert abs(gdf.describe()["gedi.value"]["mean"] - 3143.5934365441703) < 0.001
         assert gdf.describe()["gedi.file_id"]["max"] == 0.0
         assert gdf.describe()["gedi.flags"]["max"] == 0.0
 
@@ -136,4 +136,4 @@ def test_gedi(self, init):
             assert key in gdf.keys()
         assert abs(gdf.describe()["canopy_openness"]["max"] - 10.390829086303711) < 0.001
         df = gdf[gdf["gedi.value"] > -9999.0]
-        assert abs(sum(df["gedi.value"]) - 42551.55461392179) < 0.001
+        assert abs(sum(df["gedi.value"]) - 42767.289459228516) < 0.001
diff --git a/targets/slideruleearth-aws/Makefile b/targets/slideruleearth-aws/Makefile
@@ -224,10 +224,10 @@ sliderule-buildenv-docker: ## build sliderule build environment docker image
 
 sliderule-docker: ## build sliderule docker image using buildenv container; needs VERSION
 	-rm -Rf $(SERVER_STAGE_DIR)
-	mkdir -p $(SERVER_STAGE_DIR)/etc
+	mkdir -p $(SERVER_STAGE_DIR)
 	rsync -a $(ROOT) $(SERVER_STAGE_DIR)/sliderule --exclude build --exclude stage
 	cp docker/sliderule/Dockerfile.runtime $(SERVER_STAGE_DIR)/Dockerfile
-	cp docker/sliderule/*.* $(SERVER_STAGE_DIR)/etc
+	cp docker/sliderule/config.json $(SERVER_STAGE_DIR)
 	cd $(SERVER_STAGE_DIR); docker $(BUILDX) build $(DOCKEROPTS) --build-arg repo=$(ECR) -t $(ECR)/sliderule:latest $(DOCKER_PLATFORM) .
 	docker tag $(ECR)/sliderule:latest $(ECR)/sliderule:$(VERSION)
 	docker tag $(ECR)/sliderule:latest $(ECR)/sliderule:$(MAJOR_VERSION)

diff --git a/targets/slideruleearth-aws/docker/sliderule/Dockerfile.runtime b/targets/slideruleearth-aws/docker/sliderule/Dockerfile.runtime
@@ -9,7 +9,7 @@ WORKDIR /sliderule/targets/slideruleearth-aws
 RUN make config-release INSTALL_DIR=/usr/local && make
 
 # install project specific files
-COPY etc/* /usr/local/etc/sliderule/
+COPY config.json /usr/local/etc/sliderule/
 
 # install runtime dependencies
 FROM ubuntu:20.04 AS runtime