Merge pull request #60 from philvarner/pv/update-py-3.11-and-pin-numpy

update python 3.11 image and pin numpy
lambgeo · Oct 30, 2023 · 8d60f23 · 8d60f23
2 parents f88f2b3 + d9c1e2c
commit 8d60f23
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -96,7 +96,7 @@ jobs:
       - name: Build Runtime and Push
         if: github.ref == 'refs/heads/master'
         run: |
-          runtimes='3.9 3.10 3.11-preview'
+          runtimes='3.9 3.10 3.11'
           for runtime in ${runtimes}; do
             docker build \
               --platform=linux/amd64 \

diff --git a/README.md b/README.md
@@ -24,9 +24,7 @@ Runtimes images:
   - Python (based on `public.ecr.aws/lambda/python:{version}`)
     - **ghcr.io/lambgeo/lambda-gdal:3.6-python3.9**
     - **ghcr.io/lambgeo/lambda-gdal:3.6-python3.10**
-
-  - Python 3.11-preview (based on `public.ecr.aws/lambda/python:3.11-preview`)
-    - **ghcr.io/lambgeo/lambda-gdal:3.6-python3.11-preview**
+    - **ghcr.io/lambgeo/lambda-gdal:3.6-python3.11**
 
 see: https://github.com/lambgeo/docker-lambda/pkgs/container/lambda-gdal
 
@@ -63,7 +61,7 @@ ENV \
 RUN cd $PACKAGE_PREFIX && zip -r9q /tmp/package.zip *
 ```
 
-If you are working with **python3.9|3.10**, you can use lambgeo pre-build docker images:
+If you are working with **python3.9|3.10|3.11**, you can use lambgeo pre-build docker images:
 
 ```Dockerfile
 FROM ghcr.io/lambgeo/lambda-gdal:3.6-python3.10
@@ -124,9 +122,9 @@ Starting with gdal3.1 (PROJ 7.1), you can set `PROJ_NETWORK=ON` to use remote gr
 
 # AWS Lambda Layers
 
-gdal | amazonlinux version| size (Mb)| unzipped size (Mb)| arn
-  ---|                 ---|       ---|                ---| ---
-3.6  |                   2|      30.5|               73.4| arn:aws:lambda:{REGION}:524387336408:layer:gdal36:{VERSION}
+| gdal | amazonlinux version | size (Mb) | unzipped size (Mb) | arn                                                         |
+| ---- | ------------------- | --------- | ------------------ | ----------------------------------------------------------- |
+| 3.6  | 2                   | 30.5      | 73.4               | arn:aws:lambda:{REGION}:524387336408:layer:gdal36:{VERSION} |
 
 see [/layer.json](/layer.json) for the list of arns
 
@@ -147,13 +145,13 @@ cat layer.json| jq '.[] | select(.region == "us-west-2")'
 
 #### archived layers
 
-gdal | amazonlinux version| size (Mb)| unzipped size (Mb)| arn
-  ---|                 ---|       ---|                ---| ---
-3.5  |                   2|      30.5|               73.4| arn:aws:lambda:{REGION}:524387336408:layer:gdal35:{VERSION}
-3.3  |                   2|      27.7|               67.3| arn:aws:lambda:{REGION}:524387336408:layer:gdal33-al2:{VERSION}
-3.2  |                   2|      26.7|               64.6| arn:aws:lambda:{REGION}:524387336408:layer:gdal32-al2:{VERSION}
-3.1  |                   2|      25.8|                 61| arn:aws:lambda:{REGION}:524387336408:layer:gdal31-al2:{VERSION}
-2.4  |                   2|      19.5|               63.6| arn:aws:lambda:{REGION}:524387336408:layer:gdal24-al2:{VERSION}
+| gdal | amazonlinux version | size (Mb) | unzipped size (Mb) | arn                                                             |
+| ---- | ------------------- | --------- | ------------------ | --------------------------------------------------------------- |
+| 3.5  | 2                   | 30.5      | 73.4               | arn:aws:lambda:{REGION}:524387336408:layer:gdal35:{VERSION}     |
+| 3.3  | 2                   | 27.7      | 67.3               | arn:aws:lambda:{REGION}:524387336408:layer:gdal33-al2:{VERSION} |
+| 3.2  | 2                   | 26.7      | 64.6               | arn:aws:lambda:{REGION}:524387336408:layer:gdal32-al2:{VERSION} |
+| 3.1  | 2                   | 25.8      | 61                 | arn:aws:lambda:{REGION}:524387336408:layer:gdal31-al2:{VERSION} |
+| 2.4  | 2                   | 19.5      | 63.6               | arn:aws:lambda:{REGION}:524387336408:layer:gdal24-al2:{VERSION} |
 
 see [/archived_layer.json](/archived_layer.json) for the list of arns
 

diff --git a/dockerfiles/runtimes/python b/dockerfiles/runtimes/python
@@ -12,13 +12,13 @@ ENV \
   LC_ALL=en_US.UTF-8 \
   CFLAGS="--std=c99"
 
-RUN yum install -y gcc gcc-c++
+RUN yum install -y gcc gcc-c++ && \
+    yum clean all && \
+    rm -rf /var/cache/yum /var/lib/yum/history
+
 RUN \
     python -m pip install pip -U \
-    && python -m pip install cython numpy wheel --no-binary numpy
-
-RUN yum clean all \
-    && rm -rf /var/cache/yum /var/lib/yum/history
+    && python -m pip install cython numpy==1.25 wheel --no-binary numpy
 
 # The PREFIX should be the same as in gdal{version}:latest
 # When building rasterio, setup.py will get libs directoy from gdal-config