Merge pull request #77 from developmentseed/develop

Publish 2.0.0rc1

Author: matthewhanson

CHANGELOG.md

@@ -6,32 +6,40 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+
+## [v2.0.0rc1] - 2019-10-25
+
+### Added
+- Added OpenSSL, which is used to compile versions of Python 3.7+, it is not packaged in GeoLambda Layer
+- OPENSSL_VERSION=1.0.2
+
+### Changed
+- Updated GDAL, PROJ, and Geotiff libraries.
+- GDAL_VERSION=3.0.1
+- PROJ_VERSION=6.2.0
+- GEOTIFF_VERSION=1.5.1
+
+
 ## [v1.2.0] - 2019-10-24
 
 ### Added
 - A Python GeoLambda Layer is now published, along with the base Lambda Layer. The base layer *must* be included in any Lambda that uses the Python GeoLambda layer. It includes the Python libraries GDAL, rasterio, pyproj, and shapely.
 - Base geolambda includes OpenSSL 1.0.2, as this is required for compiling Python 3.7+. It is not included in the Lambda layer, just the base layer for ease of creating different versions of Python child images.
 
+
 ### Changed
 - The python diectory, and the new Lambda layer, now uses Python 3.7.4
-
-### Package versions
 - GDAL_VERSION=2.4.2
-- PROJ_VERSION=5.2.0
 - GEOS_VERSION=3.8.0
-- GEOTIFF_VERSION=1.4.3
-- HDF4_VERSION=4.2.14
-- HDF5_VERSION=1.10.5
 - NETCDF_VERSION=4.7.1
 - NGHTTP2_VERSION=1.39.2
 - OPENJPEG_VERSION=2.3.1
 - CURL_VERSION=7.66.0
 - LIBJPEG_TURBO_VERSION=2.0.3
-- PKGCONFIG_VERSION=0.29.2
-- SZIP_VERSION=2.1.1
 - WEBP_VERSION=1.0.3
 - ZSTD_VERSION=1.4.3
 
+
 ## [v1.1.0] - 2018-03-22
 
 ### Added
@@ -41,33 +49,31 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - More libraries (CURL with http2, webp, zstd, libjpegturbo)
 - GeoTIFF now compiled from scratch rather than GGDAL builtin
 - Published public lambda layers - see README for ARNs
+- GEOTIFF_VERSION=1.4.3
+- OPENJPEG_VERSION=2.3.0
+- LIBJPEG_TURBO_VERSION=2.0.1
+- CURL_VERSION=7.59.0
+- NGHTTP2_VERSION=1.35.1
+- WEBP_VERSION=1.0.1
+- ZSTD_VERSION=1.3.8
 
 ### Changed
 - Major refactor, GeoLambda base now runtime agnostic contains system libraries only
-
-### Removed
-- Removed Python codes to make geolambda system libraries only
-
-### Package versions:
 - GDAL_VERSION=2.4.1
-- PROJ_VERSION=5.2.0
 - GEOS_VERSION=3.7.1
-- GEOTIFF_VERSION=1.4.3
-- OPENJPEG_VERSION=2.3.0
-- LIBJPEG_TURBO_VERSION=2.0.1
 - HDF4_VERSION=4.2.14
 - HDF5_VERSION=1.10.5
 - NETCDF_VERSION=4.6.2
-- CURL_VERSION=7.59.0
-- NGHTTP2_VERSION=1.35.1
-- PKGCONFIG_VERSION=0.29.2
-- SZIP_VERSION=2.1.1
-- WEBP_VERSION=1.0.1
-- ZSTD_VERSION=1.3.8
+
+### Removed
+- Removed Python codes to make geolambda system libraries only
+
 
 ## [v1.0.0] - 2018-07-27
 
-#### Versions:
+Initial release
+
+Package Versions
 - PROJ_VERSION=5.2.0
 - GEOS_VERSION=3.6.2
 - HDF4_VERSION=4.2.12
@@ -79,5 +85,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - GDAL_VERSION=2.3.1
 
 [Unreleased]: https://github.com/sat-utils/sat-stac/compare/master...develop
+[v2.0.0]: https://github.com/developmentseed/geolambda/compare/1.2.0...2.0.0rc1
+[v1.2.0]: https://github.com/developmentseed/geolambda/compare/1.1.0...1.2.0
 [v1.1.0]: https://github.com/developmentseed/geolambda/compare/1.0.0...1.1.0
 [v1.0.0]: https://github.com/developmentseed/geolambda/tree/1.0.0

Dockerfile

@@ -13,10 +13,10 @@ RUN \
 
 # versions of packages
 ENV \
-    GDAL_VERSION=2.4.2 \
-    PROJ_VERSION=5.2.0 \
+    GDAL_VERSION=3.0.1 \
+    PROJ_VERSION=6.2.0 \
     GEOS_VERSION=3.8.0 \
-    GEOTIFF_VERSION=1.4.3 \
+    GEOTIFF_VERSION=1.5.1 \
     HDF4_VERSION=4.2.14 \
     HDF5_VERSION=1.10.5 \
     NETCDF_VERSION=4.7.1 \
@@ -27,7 +27,8 @@ ENV \
     PKGCONFIG_VERSION=0.29.2 \
     SZIP_VERSION=2.1.1 \
     WEBP_VERSION=1.0.3 \
-    ZSTD_VERSION=1.4.3
+    ZSTD_VERSION=1.4.3 \
+    OPENSSL_VERSION=1.0.2
 
 # Paths to things
 ENV \
@@ -36,7 +37,9 @@ ENV \
     PREFIX=/usr/local \
     GDAL_CONFIG=/usr/local/bin/gdal-config \
     LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 \
-    GDAL_DATA=/usr/local/share/gdal
+    PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:/usr/lib64/pkgconfig \
+    GDAL_DATA=${PREFIX}/share/gdal \
+    PROJ_LIB=${PREFIX}/share/proj
 
 # switch to a build directory
 WORKDIR /build
@@ -203,7 +206,6 @@ RUN \
 
 # Open SSL is needed for building Python so it's included here for ease
 RUN \
-    OPENSSL_VERSION=1.0.2; \
     mkdir openssl; \
     wget -qO- https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
         | tar xvz -C openssl --strip-components=1; cd openssl; \

README.md

@@ -15,6 +15,7 @@ While GeoLambda was initially intended for AWS Lambda it is also useful as a bas
 | 1.0.0     | 2.3.1 | |
 | 1.1.0     | 2.4.1 | |
 | 1.2.0     | 2.4.2 | Separate Python (3.7.4) image and Lambda Layer added |
+| 2.0.0		| 3.0.1 | libgeotiff 1.5.1, proj 6.2.0 |
 
 ### Docker images
 
@@ -40,6 +41,24 @@ All of the GDAL CLI tools are installed so could be run on images in the current
 
 If you just wish to use the publicly available Lambda layer you will need the ARN for the layer in the same region as your Lambda function. Currently, GeoLambda layers are available in `us-east-1`, `us-west-2`, and `eu-central-1`. If you want to use it in another region please file an issue or you can also create your own layer using this repository (see instructions below on 'Create a new version').
 
+#### v2.0.0rc1
+
+| Region | ARN |
+| ------ | --- |
+| us-east-1 | arn:aws:lambda:us-east-1:552188055668:layer:geolambda:3 |
+| us-west-2 | arn:aws:lambda:us-west-2:552188055668:layer:geolambda:3 |
+| eu-central-1 | arn:aws:lambda:eu-central-1:552188055668:layer:geolambda:3 |
+
+#### v2.0.0rc1-python
+
+See the [GeoLambda Python README](python/README.md). The Python Lambda Layer includes the libraries `numpy`, `rasterio`, `GDAL`, `pyproj`, and `shapely`.
+
+| Region | ARN |
+| ------ | --- |
+| us-east-1 | arn:aws:lambda:us-east-1:552188055668:layer:geolambda-python:2 |
+| us-west-2 | arn:aws:lambda:us-west-2:552188055668:layer:geolambda-python:2 |
+| eu-central-1 | arn:aws:lambda:eu-central-1:552188055668:layer:geolambda-python:2 |
+
 #### v1.2.0
 
 | Region | ARN |

VERSION

@@ -1 +1 @@
-1.2.0
+2.0.0rc1

bin/package.sh

@@ -17,6 +17,7 @@ strip $DEPLOY_DIR/lib/* || true
 # copy GDAL_DATA files over
 mkdir -p $DEPLOY_DIR/share
 rsync -ax $PREFIX/share/gdal $DEPLOY_DIR/share/
+rsync -ax $PREFIX/share/proj $DEPLOY_DIR/share/
 
 # zip up deploy package
 cd $DEPLOY_DIR

build-and-test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+VERSION=$(cat VERSION)
+
+docker build . -t developmentseed/geolambda:${VERSION}
+docker run --rm -v $PWD:/home/geolambda -it developmentseed/geolambda:${VERSION} package.sh
+
+cd python
+docker build . --build-arg VERSION=${VERSION} -t developmentseed/geolambda:${VERSION}-python
+docker run -v ${PWD}:/home/geolambda -t developmentseed/geolambda:${VERSION}-python package-python.sh
+
+docker run --rm -v ${PWD}/lambda:/var/task -v ${PWD}/../lambda:/opt lambci/lambda:python3.7 lambda_function.lambda_handler '{}'

python/requirements.txt

@@ -1,4 +1,4 @@
-GDAL==2.4.2
+GDAL==3.0.1
 rasterio==1.1.0 --no-binary rasterio
 shapely==1.6.4.post2
 pyproj==2.4.0