Skip to content

Commit 2f0ccf1

Browse files
committed
Merge 'upstream/master' into jy-fix-devsite-links
2 parents aa9b074 + 65c8ec8 commit 2f0ccf1

104 files changed

Lines changed: 560 additions & 108090 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ Please go through each entry in the below checklist and mark an 'X' if that cond
1010
- [ ] All `import`s are in the first cell? First block of imports are standard libraries, second block are 3rd party libraries, third block are all `arcgis` imports? Note that in some cases, for samples, it is a good idea to keep the imports next to where they are used, particularly for uncommonly used features that we want to highlight.
1111
- [ ] All `GIS` object instantiations are one of the following?
1212
- `gis = GIS()`
13-
- `gis = GIS('https://www.arcgis.com', 'arcgis_python', 'P@ssword123')`
14-
- `gis = GIS(profile="your_online_profile")`
15-
- `gis = GIS('https://pythonapi.playground.esri.com/portal', 'arcgis_python', 'amazing_arcgis_123')`
13+
- `gis = GIS('home')`
14+
- `gis = GIS(profile="your_online_portal")`
15+
- `gis = GIS('https://pythonapi.playground.esri.com/portal')`
1616
- `gis = GIS(profile="your_enterprise_portal")`
1717
- [ ] If this notebook requires setup or teardown, did you add the appropriate code to `./misc/setup.py` and/or `./misc/teardown.py`?
1818
- [ ] If this notebook references any portal items that need to be staged on AGOL/Python API playground, did you coordinate with a Python API team member to stage the item the correct way with the api\_data\_owner user?

guide/01-getting-started/install-and-set-up.ipynb

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,27 @@
1717
},
1818
{
1919
"cell_type": "markdown",
20-
"metadata": {
21-
"toc": true
22-
},
20+
"metadata": {},
2321
"source": [
24-
"<h1>Table of Contents<span class=\"tocSkip\"></span></h1>\n",
25-
"<div class=\"toc\"><ul class=\"toc-item\"><li><span><a href=\"#Installation-for-ArcGIS-Pro-2.5.x-and-later\" data-toc-modified-id=\"Installation-for-ArcGIS-Pro-2.5.x-and-later-1\">Installation for ArcGIS Pro 2.5.x and later</a></span><ul class=\"toc-item\"><li><span><a href=\"#Installation-using-Python-Package-Manager\" data-toc-modified-id=\"Installation-using-Python-Package-Manager-1.1\">Installation using Python Package Manager</a></span></li><li><span><a href=\"#Installation-using-Python-Command-Prompt\" data-toc-modified-id=\"Installation-using-Python-Command-Prompt-1.2\">Installation using Python Command Prompt</a></span></li><li><span><a href=\"#Upgrade-package\" data-toc-modified-id=\"Upgrade-package-1.3\">Upgrade package</a></span></li></ul></li><li><span><a href=\"#Installation-using-Anaconda-for-Python-Distribution\" data-toc-modified-id=\"Installation-using-Anaconda-for-Python-Distribution-2\">Installation using Anaconda for Python Distribution</a></span><ul class=\"toc-item\"><li><ul class=\"toc-item\"><li><span><a href=\"#conda\" data-toc-modified-id=\"conda-2.0.1\">conda</a></span></li><li><span><a href=\"#Pipenv\" data-toc-modified-id=\"Pipenv-2.0.2\">Pipenv</a></span></li></ul></li></ul></li><li><span><a href=\"#Install-with-minimum-dependencies\" data-toc-modified-id=\"Install-with-minimum-dependencies-3\">Install with minimum dependencies</a></span></li><li><span><a href=\"#Installation-as-a-Docker-image\" data-toc-modified-id=\"Installation-as-a-Docker-image-4\">Installation as a Docker image</a></span></li><li><span><a href=\"#Install-Offline\" data-toc-modified-id=\"Install-Offline-5\">Install Offline</a></span><ul class=\"toc-item\"><li><ul class=\"toc-item\"><li><ul class=\"toc-item\"><li><span><a href=\"#1.-While-in-a-connected-environment,-download-the-appropriate-software-you'll-need:\" data-toc-modified-id=\"1.-While-in-a-connected-environment,-download-the-appropriate-software-you'll-need:-5.0.0.1\">1. While in a connected environment, download the appropriate software you'll need:</a></span></li><li><span><a href=\"#2.-Configure-Anaconda-for-use-in-the-disconnected-enviroment:\" data-toc-modified-id=\"2.-Configure-Anaconda-for-use-in-the-disconnected-enviroment:-5.0.0.2\">2. Configure Anaconda for use in the disconnected enviroment:</a></span></li><li><span><a href=\"#3.-Verify-the-install:\" data-toc-modified-id=\"3.-Verify-the-install:-5.0.0.3\">3. Verify the install:</a></span></li></ul></li></ul></li><li><span><a href=\"#Installation-for-older-versions\" data-toc-modified-id=\"Installation-for-older-versions-5.1\">Installation for older versions</a></span></li><li><span><a href=\"#Using-the-Deep-Learning-Frameworks-Installer\" data-toc-modified-id=\"Using-the-Deep-Learning-Frameworks-Installer-5.2\">Using the Deep Learning Frameworks Installer</a></span></li><li><span><a href=\"#Install-using-Python-Command-Prompt-or-Anaconda\" data-toc-modified-id=\"Install-using-Python-Command-Prompt-or-Anaconda-5.3\">Install using Python Command Prompt or Anaconda</a></span></li></ul></li><li><span><a href=\"#Test-your-install-with-jupyter-notebook\" data-toc-modified-id=\"Test-your-install-with-jupyter-notebook-6\">Test your install with jupyter notebook</a></span></li></ul></div>"
22+
"## Table of Contents\n",
23+
"* [Installation for ArcGIS Pro 2.5.x and later](#Installation-for-ArcGIS-Pro-2.5.x-and-later)\n",
24+
" * [Installation using Python Package Manager](#Installation-using-Python-Package-Manager)\n",
25+
" * [Installation using Python Command Prompt](#Installation-using-Python-Command-Prompt)\n",
26+
" * [Upgrade package](#Upgrade-package)\n",
27+
"* [Installation using Anaconda for Python Distribution](#Installation-using-Anaconda-for-Python-Distribution)\n",
28+
" * [conda](#Conda)\n",
29+
" * [Pipenv](#Pipenv)\n",
30+
"* [Install with minimum dependencies](#Install-with-minimum-dependencies)\n",
31+
"* [Installation as a Docker image](#Installation-as-a-Docker-image)\n",
32+
"* [Install Offline](#Install-Offline)\n",
33+
" * [1. While in a connected environment, download the appropriate software you'll need:](#1.-While-in-a-connected-environment,-download-the-appropriate-software-you'll-need:)\n",
34+
" * [2. Configure Anaconda for use in the disconnected enviroment:](2.-Configure-Anaconda-for-use-in-the-disconnected-enviroment:)\n",
35+
" * [3. Verify the install:](#3.-Verify-the-install:)\n",
36+
"* [Installation for older versions](#Installation-for-older-versions)\n",
37+
"* [Install deep learning dependencies](#Install-deep-learning-dependencies)\n",
38+
" * [Using the Deep Learning Frameworks Installer](#Using-the-Deep-Learning-Frameworks-Installer)\n",
39+
" * [Install using Python Command Prompt or Anaconda](#Install-using-Python-Command-Prompt-or-Anaconda)\n",
40+
"* [Test your install with jupyter notebook](#Test-your-install-with-jupyter-notebook)"
2641
]
2742
},
2843
{
@@ -378,11 +393,11 @@
378393
"\n",
379394
"### Using the Deep Learning Frameworks Installer\n",
380395
"\n",
381-
"To work with the deep learning tools in ArcGIS Pro 2.6, you need to install supported deep learning frameworks packages.\n",
396+
"To work with the deep learning tools in ArcGIS Pro 2.6 and later, you need to install supported deep learning frameworks packages.\n",
382397
"\n",
383-
"For instructions on how to install deep learning packages, see the [Install Deep Learning Frameworks Guide for ArcGIS Pro 2.6](https://pro.arcgis.com/en/pro-app/latest/help/analysis/deep-learning/install-deep-learning-frameworks.htm).\n",
398+
"Deep learning installer is now available at https://github.com/Esri/deep-learning-frameworks. This installer includes a broad collection of components, such as PyTorch, TensorFlow, Fast.ai and scikit-learn, for performing deep learning and machine learning tasks, a total collection of 95 packages. It adds packages to the default arcgispro-py3 environment. Any subsequent clones of that environment will also include this full collection of packages. \n",
384399
"\n",
385-
"ArcGIS Pro 2.6 deep learning installer is now available at https://github.com/Esri/deep-learning-frameworks. This installer includes a broad collection of components, such as PyTorch, TensorFlow, Fast.ai and scikit-learn, for performing deep learning and machine learning tasks, a total collection of 95 packages. It adds packages to the default arcgispro-py3 environment. Any subsequent clones of that environment will also include this full collection of packages. "
400+
"For instructions on how to install deep learning installer manually or over ArcGIS Image Server, click [here](https://github.com/Esri/deep-learning-frameworks/blob/master/install-deep-learning-frameworks-manually-2-7.pdf)."
386401
]
387402
},
388403
{
@@ -436,7 +451,11 @@
436451
"source": [
437452
"- For Multispectral data support (optional and needed only for Anaconda users)\n",
438453
"\n",
439-
" ```conda install -c esri gdal=2.3.3```"
454+
" ```conda install -c esri gdal=2.3.3```\n",
455+
" \n",
456+
" \n",
457+
" \n",
458+
"Alternatively, you may also use [deep learning essentials](https://anaconda.org/esri/deep-learning-essentials) to install deep learning environment."
440459
]
441460
},
442461
{
@@ -542,7 +561,7 @@
542561
"name": "python",
543562
"nbconvert_exporter": "python",
544563
"pygments_lexer": "ipython3",
545-
"version": "3.6.10"
564+
"version": "3.7.9"
546565
},
547566
"toc": {
548567
"base_numbering": 1,

guide/03-the-gis/using-the-gis.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"outputs": [],
4646
"source": [
47-
"gis = GIS(\"https://www.arcgis.com\", \"arcgis_python\", \"P@ssword123\")"
47+
"gis = GIS('home')"
4848
]
4949
},
5050
{
@@ -626,4 +626,4 @@
626626
},
627627
"nbformat": 4,
628628
"nbformat_minor": 0
629-
}
629+
}

guide/03-the-gis/working-with-different-authentication-schemes.ipynb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
],
121121
"source": [
122122
"print(\"ArcGIS Online Org account\") \n",
123-
"gis = GIS(\"https://www.arcgis.com\", \"arcgis_python\", \"P@ssword123\")\n",
123+
"gis = GIS('home')\n",
124124
"print(\"Logged in as \" + str(gis.properties.user.username))"
125125
]
126126
},
@@ -511,8 +511,7 @@
511511
"#Define 2 different profiles for two different urls\n",
512512
"playground_gis = GIS(url=\"https://pythonapi.playground.esri.com/portal\", username='arcgis_python', password='amazing_arcgis_123',\n",
513513
" profile='python_playground_prof')\n",
514-
"agol_gis = GIS(url=\"https://arcgis.com/\", username='arcgis_python', password=\"P@ssword123\",\n",
515-
" profile=\"AGOL_prof\")\n",
514+
"agol_gis = GIS('home')\n",
516515
"print(\"profile defined for {}\".format(playground_gis))\n",
517516
"print(\"profile defined for {}\".format(agol_gis))"
518517
]
@@ -616,4 +615,4 @@
616615
},
617616
"nbformat": 4,
618617
"nbformat_minor": 1
619-
}
618+
}

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,8 @@
100100
"source": [
101101
"### Make a GIS Connection\n",
102102
"\n",
103-
"The cell below is a generic placeholder to illustrate connecting to your GIS through a profile holding your specific credentials. This notebook accesses data shared within a particular ArcGIS Online Organization accessible with the following credentials:\n",
104-
"\n",
105-
"* url = https://www.arcgis.com\n",
106-
"* username = arcgis_python\n",
107-
"* password = P@ssword123\n",
108-
"\n",
109-
"So make a connection with the following syntax to continue running through the notebook:\n",
110-
"`gis = GIS(\"https://www.arcgis.com\", \"arcgis_python\", \"P@ssword123\")`"
103+
"You can make a GIS connection with the following syntax to continue running through the notebook:\n",
104+
"`gis = GIS(\"https://www.arcgis.com\", \"username\", \"password\")`"
111105
]
112106
},
113107
{
@@ -3412,4 +3406,4 @@
34123406
},
34133407
"nbformat": 4,
34143408
"nbformat_minor": 2
3415-
}
3409+
}

guide/05-working-with-the-spatially-enabled-dataframe/introduction-to-the-spatially-enabled-dataframe.ipynb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"* [Accessing local GIS Data](#Accessing-local-GIS-data)\n",
3232
" * [Example: Reading a Shapefile](#Example:-Reading-a-Shapefile)\n",
3333
" * [Example: Reading a Featureclass from FileGDB](#Example:-Reading-a-Featureclass-from-FileGDB)\n",
34-
"* [Saving Spatiall Enabled DataFrames](#Saving-Spatially-Enabled-DataFrames)\n",
34+
"* [Saving Spatially Enabled DataFrames](#Saving-Spatially-Enabled-DataFrames)\n",
3535
" * [Export Options](#Export-Options)\n",
3636
" * [Exporting to a Feature Class](#Export-to-Feature-Class)\n",
3737
" * [Example: Export a whole dataset to a Shapefile](#Example:-Export-a-whole-dataset-to-a-shapefile:)\n",
@@ -58,7 +58,7 @@
5858
"metadata": {},
5959
"source": [
6060
"## Accessing GIS data\n",
61-
"GIS users need to work with both published layers on remote servers (web layers) and local data, but the ability to manipulate these datasets without permanentently copying the data is lacking. The `Spatial Enabled DataFrame` solves this problem because it is an in-memory object that can read, write and manipulate geospatial data.\n",
61+
"GIS users need to work with both published layers on remote servers (web layers) and local data, but the ability to manipulate these datasets without permanently copying the data is lacking. The `Spatial Enabled DataFrame` solves this problem because it is an in-memory object that can read, write and manipulate geospatial data.\n",
6262
"\n",
6363
"The SEDF integrates with Esri's [`ArcPy` site-package](http://pro.arcgis.com/en/pro-app/arcpy/get-started/what-is-arcpy-.htm) as well as the open source [`pyshp`](https://github.com/GeospatialPython/pyshp/), [`shapely`](https://github.com/Toblerity/Shapely) and [`fiona`](https://github.com/Toblerity/Fiona) packages. This means the ArcGIS API for Python SEDF can use either of these geometry engines to provide you options for easily working with geospatial data regardless of your platform. The SEDF transforms data into the formats you desire so you can use Python functionality to analyze and visualize geographic information.\n",
6464
"\n",
@@ -633,7 +633,7 @@
633633
"metadata": {},
634634
"source": [
635635
"#### Example: Feature Layer Query Results to a Spatially Enabled DataFrame\n",
636-
"We'll use the `AGE_45_54` column to query the dataframe and return a new `DataFrame` with a subset of records. We can use the built-in [`zip()`](https://docs.python.org/3/library/functions.html#zip) function to print the data frame attribute field names, and then use data frame syntax to view specific attribute fields in the output:"
636+
"We'll use the `AGE_45_54` column to query the data frame and return a new `DataFrame` with a subset of records. We can use the built-in [`zip()`](https://docs.python.org/3/library/functions.html#zip) function to print the data frame attribute field names, and then use data frame syntax to view specific attribute fields in the output:"
637637
]
638638
},
639639
{
@@ -775,7 +775,7 @@
775775
" * [`shapefiles`](http://desktop.arcgis.com/en/arcmap/latest/manage-data/shapefiles/what-is-a-shapefile.htm), \n",
776776
" * [`ArcGIS Server Web Services`](https://enterprise.arcgis.com/en/server/latest/publish-services/windows/what-types-of-services-can-you-publish.htm) and [`ArcGIS Online Hosted Feature Layers`](https://doc.arcgis.com/en/arcgis-online/share-maps/publish-features.htm) \n",
777777
" * [`OGC Services`](http://www.opengeospatial.org/standards) \n",
778-
"* If the **ArcPy** module is not installed, the SEDF [`from_featureclass`](https://esri.github.io/arcgis-python-api/apidoc/html/arcgis.features.toc.html?arcgis.features.GeoAccessor.from_featureclass#arcgis.features.GeoAccessor.from_featureclass) method only supports consuming an Esri [`shapefile`](http://desktop.arcgis.com/en/arcmap/latest/manage-data/shapefiles/what-is-a-shapefile.htm)\n",
778+
"* If the **`ArcPy`** module is not installed, the SEDF [`from_featureclass`](https://esri.github.io/arcgis-python-api/apidoc/html/arcgis.features.toc.html?arcgis.features.GeoAccessor.from_featureclass#arcgis.features.GeoAccessor.from_featureclass) method only supports consuming an Esri [`shapefile`](http://desktop.arcgis.com/en/arcmap/latest/manage-data/shapefiles/what-is-a-shapefile.htm)\n",
779779
"> Please note that you must install the `pyshp` package to read shapefiles in environments that don't have access to `ArcPy`.\n",
780780
" \n",
781781
"### Example: Reading a Shapefile\n",
@@ -1016,7 +1016,7 @@
10161016
"source": [
10171017
"### Example: Reading a Featureclass from FileGDB\n",
10181018
"\n",
1019-
"> You must have `fiona` installed if you use the `from_featureclass()` method to read a featureclass from FileGDB with a Python interpreter that does not have access to `ArcPy`.\n"
1019+
"> You must have `fiona` installed if you use the `from_featureclass()` method to read a feature class from FileGDB with a Python interpreter that does not have access to `ArcPy`.\n"
10201020
]
10211021
},
10221022
{

guide/08-using-geoprocessing-tools/accessing-geoprocessing-tools.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
"outputs": [],
4545
"source": [
46-
"gis = GIS('https://www.arcgis.com', 'arcgis_python', 'P@ssword123')"
46+
"gis = GIS('home')"
4747
]
4848
},
4949
{
@@ -391,4 +391,4 @@
391391
},
392392
"nbformat": 4,
393393
"nbformat_minor": 1
394-
}
394+
}

guide/10-mapping-and-visualization/managing-offline-map-areas.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"source": [
3333
"from arcgis.gis import GIS\n",
3434
"from arcgis.mapping import WebMap\n",
35-
"gis = GIS(\"https://www.arcgis.com\",\"arcgis_python\",\"P@ssword123\")"
35+
"gis = GIS('home')"
3636
]
3737
},
3838
{
@@ -389,4 +389,4 @@
389389
},
390390
"nbformat": 4,
391391
"nbformat_minor": 1
392-
}
392+
}

guide/10-mapping-and-visualization/working-with-web-maps-and-web-scenes.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"from arcgis.gis import GIS\n",
2828
"\n",
2929
"# connect to your GIS\n",
30-
"gis = GIS(\"https://www.arcgis.com\",\"arcgis_python\",\"P@ssword123\")"
30+
"gis = GIS('home')"
3131
]
3232
},
3333
{
@@ -698,4 +698,4 @@
698698
},
699699
"nbformat": 4,
700700
"nbformat_minor": 1
701-
}
701+
}

guide/11-performing-network-analyses/part2_find_routes.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
"cell_type": "markdown",
9595
"metadata": {},
9696
"source": [
97-
"If you have already set up a profile to connect to your ArcGIS Online organization, execute the cell below to load the profile and create the GIS class object. If not, use a traditional username/password log-in e.g. `my_gis = GIS('https://www.arcgis.com', 'arcgis_python', 'P@ssword123', verify_cert=False, set_active=True)`"
97+
"If you have already set up a profile to connect to your ArcGIS Online organization, execute the cell below to load the profile and create the GIS class object. If not, use a traditional username/password log-in e.g. `my_gis = GIS('https://www.arcgis.com', 'username', 'password', verify_cert=False, set_active=True)`"
9898
]
9999
},
100100
{
@@ -2248,4 +2248,4 @@
22482248
},
22492249
"nbformat": 4,
22502250
"nbformat_minor": 2
2251-
}
2251+
}

0 commit comments

Comments
 (0)