Merge remote-tracking branch 'upstream/dev_site_current' into dev_site_current

Author: DavidJVitale

environment.yml

@@ -0,0 +1,8 @@
+channels:
+- defaults
+- esri
+dependencies:
+- arcgis
+- notebook
+- ipywidgets >=5.2.2,<7
+- widgetsnbextension >=1.2.6,<3

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

@@ -84,7 +84,7 @@
     "  * Select the release you want to install\n",
     "  * Click 'Install' and accept the terms and conditions\n",
     "\n",
-    "![install using ArcGIS Pro](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_InstallAndSetup_03.PNG)\n",
+    "![install using ArcGIS Pro](../../static/img/guide_getstarted_InstallAndSetup_03.png)\n",
     "\n",
     "To use the API in different IDEs, proceed to **[Using the API](#Using-the-API)**\n",
     "\n",
@@ -98,7 +98,7 @@
     "    conda install -c esri arcgis\n",
     "    ```\n",
     "\n",
-    "![python command prompt](http://esri.github.io/arcgis-python-api/notebooks/nbimages/Python_Command_Prompt.png)\n",
+    "![python command prompt](../../static/img/Python_Command_Prompt.png)\n",
     "\n",
     "To use the API in different IDEs, proceed to **[Using the API](#Using-the-API)**\n",
     "\n",
@@ -116,7 +116,7 @@
     "\n",
     "![install arcgis package mac](http://esri.github.io/arcgis-python-api/notebooks/nbimages/install_arcgis_pkg_mac.png)\n",
     "\n",
-    "To use the API in different IDEs, proceed to **[Using the API](#Using-the-API)** \n",
+    "To use the API in different IDEs, proceed to **[Using the API](#Using-the-API)**\n",
     "\n",
     "### Install using pip\n",
     "\n",
@@ -128,6 +128,8 @@
     "\n",
     "Pip and conda are totally seperate package managers, and should avoid being used interchangeably. It is recommended you use conda to install the API if you are a beginner user. [Read more about the differences](https://stackoverflow.com/questions/20994716/what-is-the-difference-between-pip-and-conda).\n",
     "\n",
+    "> Note: when installing the ArcGIS API for Python with pip, some dependencies may require Microsoft Visual C++ 14.0. If you see any errors related to this, either install the Microsoft Visual C++ tools or install the API without dependencies.\n",
+    "\n",
     "### Install without Dependencies\n",
     "\n",
     "Both ```conda install -c esri arcgis``` and ```pip install arcgis``` will install all of the dependencies outlined in the [system requirements](https://developers.arcgis.com/python/guide/system-requirements/) section. However, the API can function in a 'stripped down' state with only the ```six``` dependency. This means you can manually manage the dependencies on your system if you don't want to use every feature of the API. \n",
@@ -151,7 +153,7 @@
     " * Select the `Update Packages` option\n",
     " * Choose the appropriate arcgis release from the list of packages with recent updates\n",
     " \n",
-    " ![python_package_manager_update_pkg](http://esri.github.io/arcgis-python-api/notebooks/nbimages/python_package_manager_update_pkg.png)\n",
+    " ![python_package_manager_update_pkg](../../static/img/python_package_manager_update_pkg.png)\n",
     " \n",
     " * Click the Update button\n",
     " \n",
@@ -206,7 +208,7 @@
     "    \n",
     "You should see a map come up as shown below:\n",
     "\n",
-    "![test your install](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_InstallAndSetup_02.PNG)\n",
+    "![test your install](../../static/img/guide_getstarted_InstallAndSetup_02.PNG)\n",
     "\n",
     "Learn more about the API using the [guide](/python/guide/) and try out the [samples](/python/sample-notebooks/)."
    ]
@@ -231,7 +233,7 @@
     " \n",
     "     `docker pull esridocker/arcgis-api-python-notebook`\n",
     "    \n",
-    "    ![docker pull command](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_InstallAndSetup_04.PNG)\n",
+    "    ![docker pull command](../../static/img/guide_getstarted_InstallAndSetup_04.PNG)\n",
     "\n",
     "\n",
     " * Then spin the image into a container using the following command in terminal. Replace the `<localport>` with an available port number, for instance `8889`. \n",
@@ -259,6 +261,13 @@
     "<br>\n",
     "**NOTE:** For advanced users or those needing information on specific environments, see [Configuration](https://conda.io/docs/user-guide/configuration/use-condarc.html) for options to configure various aspects of conda"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -278,7 +287,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.3"
+   "version": "3.5.5"
   },
   "varInspector": {
    "cols": {

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

@@ -13,20 +13,22 @@
     "Python 3.5 or later is required to use the ArcGIS API for Python.\n",
     "\n",
     "## Dependencies\n",
-    "The full power of the ArcGIS API for Python is best experienced when all its dependencies are installed. However, specific tasks such as GIS administration and content management can be accopmplished even when installed with just the [`six`](https://pypi.python.org/pypi/six) package. See [Install without Dependencies](../install-and-set-up/#Install-without-Dependencies) to install the `arcgis` package in this manner.\n",
+    "The full power of the ArcGIS API for Python is best experienced when all its dependencies are installed. However, specific tasks such as GIS administration and content management can be accomplished with just the [`six`](https://pypi.python.org/pypi/six) package installed. See [Install without Dependencies](../install-and-set-up/#Install-without-Dependencies) to install the `arcgis` package in this manner.\n",
     "\n",
-    "However, there are additional dependencies needed to use specific features of the ArcGIS API for Python. In order to utilize the ArcGIS API for Python in its full capacity, it is recommended to install the `arcgis` package with pip or conda as all these dependencies are installed. See the fill list below:\n",
+    "It is recommended to install the `arcgis` package the default way of either `conda install -c esri arcgis` or `pip install arcgis`. When installed in this manner, all the below dependencies are automatically installed. (Note that most of these packages have dependencies of their own.)\n",
     "\n",
     "* [six](https://pypi.python.org/pypi/six)\n",
-    "* [pandas](https://pandas.pydata.org/)\n",
-    "* [numpy](http://www.numpy.org/)\n",
+    "* [pandas >=0.22](https://pandas.pydata.org/)\n",
+    "* [numpy >=1.13](http://www.numpy.org/)\n",
     "* [pyshp](https://pypi.python.org/pypi/pyshp/)\n",
     "* [matplotlib](https://matplotlib.org/)\n",
     "* [notebook](https://ipython.org/notebook.html)\n",
     "* [ipywidgets >=5.2.2,<7](https://ipywidgets.readthedocs.io/en/stable/)\n",
     "* [widgetsnbextension >=1.2.6,<3](https://pypi.python.org/pypi/widgetsnbextension)\n",
     "* [keyring](https://pypi.python.org/pypi/keyring/10.6.0)\n",
-    "* [winkerberos](https://pypi.python.org/pypi/winkerberos/0.7.0) (Windows only)"
+    "* [winkerberos](https://pypi.python.org/pypi/winkerberos/0.7.0) (Windows only)\n",
+    "\n",
+    "> Note: if `arcpy` is found in the current python environment, it may be used in various locations. Otherwise, `pyshp` will be used. See [SpatialDataFrame](https://esri.github.io/arcgis-python-api/apidoc/html/arcgis.features.toc.html?highlight=spatialdataframe#spatialdataframe) for more information."
    ]
   }
  ],
@@ -46,7 +48,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.3"
+   "version": "3.5.5"
   }
  },
  "nbformat": 4,

guide/01-getting-started/understanding-conda.ipynb

@@ -111,13 +111,13 @@
     "\n",
     "`conda info --envs`\n",
     "\n",
-    "![conda_info_envs Image](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_UnderstandingConda01.png)\n",
+    "![conda_info_envs Image](../../static/img/guide_getstarted_UnderstandingConda01.png)\n",
     "\n",
     "Enter the directory name and add python.exe to set the correct path to the Python interpreter for a specific environment. For example, the correct interpreter for the arcgispro-py3 environment in an IDE based on the screenshot above would be:\n",
     "\n",
     "`C:\\Program Files\\ArcGIS\\Pro\\bin\\Python\\envs\\arcgispro-py3\\python.exe`\n",
     "\n",
-    "![conda environment interpreter in PyCharm IDE](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_UnderstandingConda_pycharm.png)\n",
+    "![conda environment interpreter in PyCharm IDE](../../static/img/guide_getstarted_UnderstandingConda_pycharm.png)\n",
     "\n",
     "See [Finding your Anaconda Python interpreter path](https://docs.anaconda.com/anaconda/user-guide/tasks/integration/python-path) for more detailed instructions on different systems.\n",
     "\n",

guide/01-getting-started/using-the-jupyter-notebook-environment.ipynb

@@ -26,7 +26,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "![Windows command prompt running jupyter notebook](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_UsingJupyterNotebooks_01.png)"
+    "![Windows command prompt running jupyter notebook](../../static/img/guide_getstarted_UsingJupyterNotebooks_01.png)"
    ]
   },
   {
@@ -44,7 +44,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "![Jupyter Notebook web application](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_UsingJupyterNotebooks_02.png)\n",
+    "![Jupyter Notebook web application](../../static/img/guide_getstarted_UsingJupyterNotebooks_02.png)\n",
     "\n",
     "The page you see in this image is called the Notebook Dashboard."
    ]
@@ -62,7 +62,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "![running a sample notebook](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_GetStarted_UsingJupyterNotebooks_03.gif)\n",
+    "![running a sample notebook](../../static/img/guide_GetStarted_UsingJupyterNotebooks_03.gif)\n",
     "\n",
     "When a cell is executing the cell number turns to an asterisk `(*)` and the circle next to the kernal name (Python 3 in the gif above) turns solid."
    ]
@@ -75,7 +75,7 @@
     "\n",
     "In addition to running the sample notebooks, you can create new notebooks for your projects. To do so, from the Notebook Dashboard page, click on the 'New' button and select a Python kernel of choice as shown in the image below.\n",
     "\n",
-    "![creating new notebooks](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_UsingJupyterNotebooks_04.png)\n",
+    "![creating new notebooks](../../static/img/guide_getstarted_UsingJupyterNotebooks_04.png)\n",
     "\n",
     "Alternately, you can create new notebooks from the 'File' menu of a running notebook. In the screenshot above, note the icons of currently running notebooks are green in color."
    ]
@@ -88,10 +88,17 @@
     "\n",
     "You can get a tour of the notebook interface from the `Help -> User Interface Tour` menu. As you get used to this new interface, you can enhance your productivity by learning a few keyboard shortcuts. Accessing `Help > Keyboard shortcuts` from a running notebook will bring up a help dialog as shown below.\n",
     "\n",
-    "![keyboard shortcuts](http://esri.github.io/arcgis-python-api/notebooks/nbimages/guide_getstarted_UsingJupyterNotebooks_05.png)\n",
+    "![keyboard shortcuts](../../static/img/guide_getstarted_UsingJupyterNotebooks_05.png)\n",
     "\n",
     "Among the shortcuts, `ctrl + shift + P` or `cmd + shift + P` on a mac is particularly useful as it brings up a command palette into which you can type what you wish to do and execute it. Refer to this blog article [Five tips to get you started with Jupyter notebooks](https://blogs.esri.com/esri/arcgis/2017/06/30/82220/) to get further understanding on patterns to follow while using Jupyter notebooks."
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
@@ -111,7 +118,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.2"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,