Updating next branch with changes to master since 2.4.1 and patch releases

.github/workflows/DockerBuild.LambdaBaseImage.yaml

@@ -11,7 +11,7 @@ on:
       version:
         description: "Version of ArcGIS API for Python to install in the image"
         type: string
-        default: "2.3.1"
+        default: "2.4.1"
       python_version:
         description: "Python version to base image on"
         type: string

.github/workflows/DockerBuild.NotebookImage.yaml

@@ -11,7 +11,7 @@ on:
       version:
         description: "Version of ArcGIS API for Python to install in the image"
         type: string
-        default: "2.3.1"
+        default: "2.4.1"
       python_version:
         description: "Python version to base image on"
         type: string

.github/workflows/release-create-samples-zip.yaml

@@ -0,0 +1,26 @@
+# This workflow creates samples.zip from samples directory 
+# and uploads it automatically to the release when it is published
+name: Release - Upload samples.zip
+
+on:
+  release:
+    types:
+    # published is triggered when a release is created without a draft
+    # or a draft is published
+      - published
+
+jobs:
+  upload-samples:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Create samples.zip
+        run: |
+          zip -r samples.zip samples
+      - name: Upload samples.zip to release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            samples.zip

.gitignore

@@ -2,3 +2,4 @@ guide/gis module/.ipynb_checkpoints/class gis.ContentManager-checkpoint.ipynb
 .ipynb_checkpoints
 .idea/
 .DS_Store
+pixi.lock

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+  "recommendations": [
+    "ms-azuretools.vscode-azurefunctions",
+    "ms-python.python"
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Attach to Python Functions",
+            "type": "debugpy",
+            "request": "attach",
+            "connect": {
+                "host": "localhost",
+                "port": 9091
+            },
+            "preLaunchTask": "func: host start"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+    "azureFunctions.deploySubpath": "samples/devops_azure_functions",
+    "azureFunctions.scmDoBuildDuringDeployment": true,
+    "azureFunctions.pythonVenv": ".venv",
+    "azureFunctions.projectLanguage": "Python",
+    "azureFunctions.projectRuntime": "~4",
+    "debug.internalConsoleOptions": "neverOpen",
+    "azureFunctions.projectLanguageModel": 2,
+    "azureFunctions.projectSubpath": "samples/devops_azure_functions"
+}

.vscode/tasks.json

@@ -0,0 +1,33 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"type": "func",
+			"label": "func: host start",
+			"command": "host start",
+			"problemMatcher": "$func-python-watch",
+			"isBackground": true,
+			"dependsOn": "pip install (functions)",
+			"options": {
+				"cwd": "${workspaceFolder}/samples/devops_azure_functions"
+			}
+		},
+		{
+			"label": "pip install (functions)",
+			"type": "shell",
+			"osx": {
+				"command": "${config:azureFunctions.pythonVenv}/bin/python -m pip install -r requirements.txt"
+			},
+			"windows": {
+				"command": "${config:azureFunctions.pythonVenv}\\Scripts\\python -m pip install -r requirements.txt"
+			},
+			"linux": {
+				"command": "${config:azureFunctions.pythonVenv}/bin/python -m pip install -r requirements.txt"
+			},
+			"problemMatcher": [],
+			"options": {
+				"cwd": "${workspaceFolder}/samples/devops_azure_functions"
+			}
+		}
+	]
+}

docker/LambdaBaseImage.Dockerfile

@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.source=https://github.com/esri/arcgis-python-api
 # install dependencies, then clean yum cache
 RUN yum -y install gcc gcc-c++ krb5-devel krb5-server krb5-libs && yum clean all && rm -rf /var/cache/yum
 # install arcgis
-ARG arcgis_version="2.3.1"
+ARG arcgis_version="2.4.1"
 # adding .* ensures the latest patch version is installed
 RUN  pip3 install "arcgis==${arcgis_version}.*" --target "${LAMBDA_TASK_ROOT}" && rm -rf /root/.cache/pip
 # set entrypoint to app.py handler method

docker/NotebookImage.Dockerfile

@@ -2,7 +2,8 @@ ARG python_version="3.11"
 FROM quay.io/jupyter/minimal-notebook:python-${python_version}
 
 ARG python_version
-ARG arcgis_version="2.4.0"
+ARG arcgis_version="2.4.1"
+ARG gdal_version="3.10.2"
 ARG sampleslink="https://github.com/Esri/arcgis-python-api/releases/download/v${arcgis_version}/samples.zip"
 ARG githubfolder="arcgis-python-api"
 ARG env_name=arcgis
@@ -14,14 +15,27 @@ LABEL org.opencontainers.image.source=https://github.com/Esri/arcgis-python-api
 
 USER ${NB_UID}
 
-# Install Python API from Conda
-RUN conda create -n ${env_name} -c esri -c defaults arcgis=${arcgis_version} python=${python_version} -y --quiet --override-channels \
+# Create conda environment with specified python version
+RUN conda create -n ${env_name} -c conda-forge python=${python_version} -y --quiet --override-channels \
+    && conda clean --all -f -y \
+    && find /opt/conda -name __pycache__ -type d -exec rm -rf {} +
+
+# Install gdal
+RUN conda install -n ${env_name} -c conda-forge gdal=${gdal_version} -y --quiet --override-channels \
+    && conda clean --all -f -y \
+    && find /opt/conda -name __pycache__ -type d -exec rm -rf {} +
+
+# Install ArcGIS API for Python from pypi
+RUN . activate ${env_name} \
+    # adding .* ensures the latest patch version is installed
+    && python -m pip install "arcgis==${arcgis_version}.*" \
     && conda clean --all -f -y \
     && find /opt/conda -name __pycache__ -type d -exec rm -rf {} +
 
 # Install arcgis-mapping if arcgis_version >= 2.4.0
 RUN (dpkg --compare-versions $arcgis_version ge 2.4.0 \
-    && conda install -n ${env_name} -c esri -c defaults arcgis-mapping -y --quiet --override-channels \
+    && . activate ${env_name} \
+    && python -m pip install arcgis-mapping \
     && conda clean --all -f -y \
     && find /opt/conda -name __pycache__ -type d -exec rm -rf {} +;) \
     || echo "[INFO] Skipped installing arcgis-mapping for version $arcgis_version (>= 2.4.0 required for arcgis-mapping)"

docker/README.md

@@ -27,36 +27,6 @@ Push to your _private_ AWS ECR instance, and configure lambda to run from this c
 
 ## AzureFunctionsBaseImage
 
-#### ghcr.io/esri/arcgis-python-api-azure-functions:latest
+The AzureFunctionsBase image has been deprecated in favor of using the standard runtime for Azure Functions development.
 
-[Sample](samples/AzureFunctions)
-
-To use this image, setup your dockerfile like
-```
-FROM ghcr.io/esri/arcgis-python-api-azure-functions:latest
-COPY . /home/site/wwwroot
-```
-
-Your copied resources will need to include:
-- `host.json`, with your appsettings
-- `function_app.py`, such as:
-
-```
-import arcgis
-import azure.functions as func
-
-app = func.FunctionApp()
-
-@app.http_trigger(route='GET /', methods=['get'])
-def main(req: func.HttpRequest) -> func.HttpResponse:
-    return func.HttpResponse(f"Hello from Azure Functions using ArcGIS API for Python {arcgis.__version__}!")
-```
-
-Push to the container registry of your choice.
-
-For futher information, see:
-
-- https://learn.microsoft.com/en-us/azure/azure-functions/functions-reference-python?tabs=asgi%2Capplication-level&pivots=python-mode-decorators#programming-model
-- https://learn.microsoft.com/en-us/azure/azure-functions/functions-deploy-container-apps?tabs=acr%2Cbash&pivots=programming-language-python#create-and-test-the-local-functions-project
-- https://github.com/Azure/azure-functions-python-worker
-- https://learn.microsoft.com/en-us/azure/azure-functions/functions-how-to-custom-container
+See `samples/devops_azure_functions` for a sample using the standard runtime deployment.

environment.yml

@@ -3,6 +3,4 @@ channels:
 - esri
 dependencies:
 - arcgis
-- notebook
-- ipywidgets >=5.2.2,<7
-- widgetsnbextension >=1.2.6,<3
+- arcgis-mapping