resolve conflicts from merging with master

Author: jyaistMap

docker/NotebookImage.Dockerfile

@@ -1,30 +1,31 @@
 ARG python_version="3.11"
-FROM quay.io/jupyter/base-notebook:python-${python_version}
+FROM quay.io/jupyter/minimal-notebook:python-${python_version}
 
 ARG python_version
-ARG arcgis_version="2.3.1"
+ARG arcgis_version="2.4.0"
 ARG sampleslink="https://github.com/Esri/arcgis-python-api/releases/download/v${arcgis_version}/samples.zip"
 ARG githubfolder="arcgis-python-api"
-ENV DOCKER_STACKS_JUPYTER_CMD="notebook"
+ARG env_name=arcgis
 
 LABEL org.opencontainers.image.authors="jroebuck@esri.com"
-LABEL org.opencontainers.image.description="Jupyter Notebook with the latest version of the ArcGIS API for Python and its Linux dependencies preinstalled"
+LABEL org.opencontainers.image.description="Jupyter environment preconfigured for ArcGIS API for Python"
 LABEL org.opencontainers.image.licenses=Apache
 LABEL org.opencontainers.image.source=https://github.com/Esri/arcgis-python-api
 
-USER root
-
-RUN apt-get update --yes && \
-    apt-get install --yes --no-install-recommends unzip && \
-    apt-get clean && rm -rf /var/lib/apt/lists/*
-
 USER ${NB_UID}
 
 # Install Python API from Conda
-RUN conda install -c esri arcgis=${arcgis_version} -y \
+RUN conda create -n ${env_name} -c esri -c defaults arcgis=${arcgis_version} python=${python_version} -y --quiet --override-channels \
     && 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 \
+    && 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)"
+
 # Fetch and extract samples from GitHub
 RUN mkdir /home/${NB_USER}/$githubfolder && \
     wget -O samples.zip $sampleslink \
@@ -36,7 +37,34 @@ RUN mkdir /home/${NB_USER}/$githubfolder && \
            work/ \
            talks/ \
            environment.yml\
+    # remove .DS_Store and __MACOSX from home directory:
+    && find /home/${NB_USER} -name ".DS_Store" -delete \
+    && rm -rf /home/${NB_USER}/__MACOSX \
     && fix-permissions /home/${NB_USER}
 
-RUN rm /opt/conda/lib/python${python_version}/site-packages/notebook/static/base/images/logo.png
-COPY --chown=${NB_USER}:users jupyter_esri_logo.png /opt/conda/lib/python${python_version}/site-packages/notebook/static/base/images/logo.png
+# See https://jupyter-docker-stacks.readthedocs.io/en/latest/using/recipes.html#add-a-custom-conda-environment-and-jupyter-kernel
+# Create Python kernel and link it to jupyter
+RUN "${CONDA_DIR}/envs/${env_name}/bin/python" -m ipykernel install --user --name="${env_name}" && \
+    fix-permissions "${CONDA_DIR}" && \
+    fix-permissions "/home/${NB_USER}"
+
+
+# More information here: https://github.com/jupyter/docker-stacks/pull/2047
+USER root
+
+# Set DOCKER_STACKS_JUPYTER_CMD to "notebook" for versions less than 2.4.0
+RUN \
+    (dpkg --compare-versions $arcgis_version lt 2.4.0 \
+    && echo 'DOCKER_STACKS_JUPYTER_CMD="notebook"' >> /etc/environment \
+    && echo "[INFO] Set DOCKER_STACKS_JUPYTER_CMD to notebook for arcgis < 2.4.0") \
+    || echo "[INFO] Using default DOCKER_STACKS_JUPYTER_CMD (lab) for arcgis >= 2.4.0"
+
+RUN \
+    # This changes a startup hook, which will activate the custom environment for the process
+    echo conda activate "${env_name}" >> /usr/local/bin/before-notebook.d/10activate-conda-env.sh && \
+    # This makes the custom environment default in Jupyter Terminals for all users which might be created later
+    echo conda activate "${env_name}" >> /etc/skel/.bashrc && \
+    # This makes the custom environment default in Jupyter Terminals for already existing NB_USER
+    echo conda activate "${env_name}" >> "/home/${NB_USER}/.bashrc"
+
+USER ${NB_UID}

guide/01-getting-started/system-requirements.ipynb

@@ -78,6 +78,7 @@
     "> Note: if `arcpy` is found in the current python environment, it may be used in various locations. Otherwise, `gdal` or `pyshp` will be used. See [Spatially Enabled DataFrame](https://developers.arcgis.com/python/api-reference/arcgis.features.toc.html?highlight=geoaccessor#arcgis.features.GeoAccessor) for more information.\n",
     "\n",
     "\n",
+    "\n",
     "### Optional Dependencies\n",
     "\n",
     "There are some other python packages that may be required to use certain functionality in the API, but are __not__ automatically installed. To use that functionality, you must manually call `conda install {package_name}` or `pip install {package_name}` for such optional packages.\n",

guide/02-api-overview/deprecation-notices.ipynb

@@ -28,6 +28,7 @@
     "- `Swipe.edit` - deprecated in **2.4.0** removed in future major release. Use the `content` property setter instead.\n",
     "- `MapAction` - deprecated in **2.4.0** removed in future major release. Use the `MediaAction` class instead.\n",
     "- `JournalStoryMap` - deprecated in **2.0.0** removed in **2.4.0**.  Template was removed from the ArcGIS platform.\n",
+    "- `Hub.initiatives` - deprecated in **2.4.0** removed in a future release. Use `Hub.sites` instead.\n",
     "\n",
     "\n",
     "### `arcgis.learn` Module\n",
@@ -189,7 +190,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.14"
+   "version": "3.11.5"
   }
  },
  "nbformat": 4,

guide/02-api-overview/overview24.ipynb

@@ -20,6 +20,17 @@
     "Primary Python Support is for version 3.11.  Secondary support is provided for Python 3.10 and 3.12.  We have dropped Support for Python 3.9."
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "ff163308-2526-4b3a-965b-5b430738c5f8",
+   "metadata": {},
+   "source": [
+    "> **Note:** The ArcGIS API for Python 2.4.0 release is supported with:\n",
+    "* ArcGIS Pro 3.4 and later cloned environments\n",
+    "* ArcGIS Enterprise 11.4 and later\n",
+    "* Stand-alone _conda_ and Python environments"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "3da4c48b-3c82-490f-9b76-d2063307b56c",
@@ -481,7 +492,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.0"
+   "version": "3.11.10"
   }
  },
  "nbformat": 4,

guide/02-api-overview/release_notes_240.ipynb

@@ -7,6 +7,8 @@
    "source": [
     "# What's new in version 2.4.0\n",
     "\n",
+    "> **Note:** The ArcGIS API for Python 2.4.0 release is supported with ArcGIS Pro 3.4 and later cloned environments for use with _arcpy_.  The 2.4.0 _arcgis_ and _arcgis-mapping_ packages are incompatible with ArcGIS Pro 3.3.x and earlier cloned environments.  The default ArcGIS Pro 3.3.x environment can be cloned and upgraded to _arcgis_ packages of 2.3.x.\n",
+    "\n",
     "## New\n",
     "Reorganized modules and refactored functionality into new classes to incorporate the new Jupyter Lab and Notebook 7 architectures.\n",
     "* Deprecated modules:\n",
@@ -492,7 +494,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.0"
+   "version": "3.11.10"
   },
   "toc": {
    "base_numbering": 1,

guide/03-the-gis/accessing-and-creating-content.ipynb

@@ -1425,7 +1425,7 @@
    "source": [
     "## Creating new content\n",
     "\n",
-    "To create new items on your GIS, use the [`add()`](/api-reference/arcgis.gis.toc.html#arcgis.gis._impl._content_manager.Folder.add) method on a [`Folder`](/python/api-reference/arcgis.gis.toc.html#folder) instance. You can get an individual _folder_ using the [`Folders.get()`](/python/api-reference/arcgis.gis.toc.html#arcgis.gis._impl._content_manager.Folders.get) method.\n",
+    "To create new items on your GIS, use the [`add()`](https://developers.arcgis.com/python/latest/api-reference/arcgis.gis.toc.html#arcgis.gis._impl._content_manager.Folder.add) method on a [`Folder`](/python/api-reference/arcgis.gis.toc.html#folder) instance. You can get an individual _folder_ using the [`Folders.get()`](/python/api-reference/arcgis.gis.toc.html#arcgis.gis._impl._content_manager.Folders.get) method.\n",
     "\n",
     "The `add()` method accepts a dictionary containing the properties of the item to be created. The optional `file`, `text`, `url`, and `data_url` parameters accept input to add the actual content. \n",
     "\n",
@@ -1472,7 +1472,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -1485,7 +1485,7 @@
     "root_folder = gis.content.folders.get()\n",
     "earthquake_csv_item = root_folder.add(\n",
     "    item_properties=csv_properties, \n",
-    "    data=csv_path,\n",
+    "    file=csv_path,\n",
     "    thumbnail = thumbnail_path\n",
     ").result()"
    ]
@@ -2332,7 +2332,7 @@
    "source": [
     "**Note**: here, we used the `add()` method to add the `FeatureCollection` object in memory as an item on the GIS. Notice we used the `text` property to pass the JSON representation of the feature collection and the `type` property to indicate the item type. You can use the same method to publish web maps and web scenes.\n",
     "\n",
-    "The [sample notebooks for content publishers](https://developers.arcgis.com/python/sample-notebooks/publishing-web-maps-and-web-scenes/) show how the concepts discussed here can be used to publish web maps and scenes to your GIS"
+    "The [sample notebooks for content publishers](/python/latest/samples/publishing-web-maps-and-web-scenes/) show how the concepts discussed here can be used to publish web maps and scenes to your GIS"
    ]
   },
   {
@@ -2582,7 +2582,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.0"
+   "version": "3.11.11"
   },
   "toc": {
    "base_numbering": 1,

guide/03-the-gis/cloning-content.ipynb

@@ -1388,28 +1388,14 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### ArcGIS Dashboards"
+    "### ArcGIS Dashboards and ArcGIS StoryMaps"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "See the [Cloning and Troubleshooting Complex Items](../cloning-complex-apps#dashboards-and-editing-item-data) guide for details on cloning ArcGIS Dashboards. "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "### Story Maps"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "See the [Cloning and Troubleshooting Complex Items](../cloning-complex-apps/#storymaps-web-scenes-and-item-remapping) guide for details on cloning ArcGIS StoryMaps. "
+    "See the [Cloning and Troubleshooting Complex Items](../cloning-complex-apps#dashboards-and-editing-item-data) guide for details on cloning ArcGIS Dashboards and ArcGIS StoryMaps. "
    ]
   },
   {
@@ -1438,7 +1424,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.17"
+   "version": "3.11.10"
   },
   "toc": {
    "base_numbering": 1,
@@ -1455,5 +1441,5 @@
   }
  },
  "nbformat": 4,
- "nbformat_minor": 2
+ "nbformat_minor": 4
 }

guide/03-the-gis/managing-your-gis-servers.ipynb

@@ -13,7 +13,13 @@
    "source": [
     "Any Web GIS Administrator can attest to the fundamental importance of managing hosted feature layers in ArcGIS online. Traditionally, adding data en masse to existing hosted feature layers typically involved a three-step process of downloading the feature layer data, merging additional edits, and finally overwriting the original feature layer.  While that workflow still suffices in many circumstances, the [`append()`](https://developers.arcgis.com/python/api-reference/arcgis.features.toc.html#arcgis.features.FeatureLayer.append) function greatly simplifies the process.  It can save you a ton of time if your features layers are large, eliminating the time involved in overwriting the feature layer. \n",
     "\n",
-    "Let's take a look at some example `append()` workflows below.  This guide document refers to the feature layer you will append data into as the `target`, while the item you append data from is referred to as the `source`."
+    "Let's take a look at some example `append()` workflows below.  This guide document refers to the feature layer you will append data into as the `target`, while the item you append data from is referred to as the `source`.\n",
+    "\n",
+    "> **Note:** Please see the [Append (Feature Service/Layer)](https://developers.arcgis.com/rest/services-reference/enterprise/append-feature-service-layer/) for technical reference details on the append operation.\n",
+    "\n",
+    "> **Note:** When appending features from files, important criteria must be met in order for the append to succeed, and only certain file formats may be supported for a given layer. Please see the documentation for your deployment before attempting to append data:\n",
+    "> * ArcGIS Online: _Manage hosted feature layers_ - [Add and update features from a file](https://doc.arcgis.com/en/arcgis-online/manage-data/manage-hosted-feature-layers.htm#APPEND)\n",
+    "> * ArcGIS Enteprise: _Manage hosted feature layers_ - [Add and update features from a file](https://enterprise.arcgis.com/en/portal/latest/use/manage-hosted-feature-layers.htm#APPEND)"
    ]
   },
   {
@@ -118,7 +124,7 @@
    "source": [
     "## Append New Features from a File Geodatabase\n",
     "\n",
-    "This first example appends new features from a File Geodatabase into a hosted feature layer. For optimal performance and minimal chance of errors when using [`append()`](https://developers.arcgis.com/python/api-reference/arcgis.features.toc.html#arcgis.features.FeatureLayer.append), Esri strongly recommends the schema for the source file to upload (source) matches the schema of the hosted feature service layer (target).  \n",
+    "This first example appends new features from a File Geodatabase into a hosted feature layer. For optimal performance and minimal chance of errors when using [`append()`](https://developers.arcgis.com/python/api-reference/arcgis.features.toc.html#arcgis.features.FeatureLayer.append), Esri strongly recommends the schema for the source file to upload (source) matches the schema of the hosted feature service layer (target).  Please note that appending from a file geodatabase is only supported in ArcGIS Online.\n",
     "\n",
     "In this first section, you'll have matching schema between your File Geodatabase item (named `SubDiv_PB11_PG48_parcels`) and a hosted feature service layer you will publish."
    ]
@@ -414,7 +420,11 @@
    "metadata": {},
    "source": [
     "### Get the source item for appending\n",
-    "In order for the append workflow to succeed, you need to add the source file containing the new features as an Item in your GIS. In this case, the data file is already uploaded as an Item for you. From there, get the item id value for this file geodatabase item containing features you want to append to the feature layer. In this case, the Schema from the file geodatabase you'll append matches that of the hosted feature layer."
+    "In order for the append workflow to succeed, you need to add the source file containing the new features as an Item in your GIS. In this case, the data file is already uploaded as an Item for you. From there, get the item id value for this file geodatabase item containing features you want to append to the feature layer. In this case, the Schema from the file geodatabase you'll append matches that of the hosted feature layer.\n",
+    "\n",
+    "> **Note:** It is important to verify the Feature Layer you use supports the operation you intend to run.  Please query the feature layer for the following properties to confirm:\n",
+    "> * `FeatureLayer.properties.supportsAppend` - see [Supports append](https://developers.arcgis.com/rest/services-reference/enterprise/append-feature-service-layer/#supports-append) for details.\n",
+    "> * `FeatureLayer.properties.supportedAppendFormats` - see [Supported append formats](https://developers.arcgis.com/rest/services-reference/enterprise/append-feature-service-layer/#supported-append-formats) for details."
    ]
   },
   {
@@ -546,7 +556,6 @@
    "source": [
     "m2 = gis.map(\"Downingtown, PA\")\n",
     "m2.center = [40.0065, -75.7033]\n",
-    "m2.zoom = 14\n",
     "m2"
    ]
   },

guide/04-feature-data-and-analysis/appending-features.ipynb

@@ -98,8 +98,8 @@
    ],
    "source": [
     "# access the item's feature layers\n",
-    "ports_layer = portal_item.layers[0]\n",
-    "ports_layer"
+    "ports_flayer = portal_item.layers[0]\n",
+    "ports_flayer"
    ]
   },
   {
@@ -118,7 +118,7 @@
    "source": [
     "# query all the features and display it on a map\n",
     "# an empty query string will return all features or the first 1000, whichever is smaller\n",
-    "ports_fset = ports_layer.query()"
+    "ports_fset = ports_flayer.query()"
    ]
   },
   {
@@ -658,7 +658,7 @@
     }
    ],
    "source": [
-    "ports_layer.properties.capabilities"
+    "ports_flayer.properties.capabilities"
    ]
   },
   {