Skip to content

Commit 135f6f0

Browse files
authored
Merge branch 'master' into tglee-vsinstall
2 parents 79fb770 + b7bb172 commit 135f6f0

File tree

4 files changed

+49
-28
lines changed

4 files changed

+49
-28
lines changed

docs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ description: Learn how to use Visual Studio 2017 to develop applications, servic
8686
<div class="card">
8787
<div class="cardImageOuter">
8888
<div class="cardImage bgdAccent1 cardScaleImage">
89-
<img data-scaleimage="./images/vs_windows-1.svg" src="./images/vs_windows-1.svg" alt="" />
89+
<img data-hoverimage="./images/vs_windows-1.svg" src="./images/vs_windows-1.svg" alt="" />
9090
</div>
9191
</div>
9292
<div class="cardText">

docs/python/installation.md

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ manager: "ghogen"
2020

2121
To install Python support for Visual Studio, follow the instructions in the section that matches your version of Visual Studio:
2222

23-
- [Visual Studio 2017](vs-tutorial-01-00.md)
23+
- [Visual Studio 2017](#visual-studio-2017)
2424
- [Visual Studio 2015](#visual-studio-2015)
2525
- [Visual Studio 2013 and earlier](#visual-studio-2013-and-earlier)
2626

@@ -36,7 +36,39 @@ To quickly test Python support after following the installation steps, Open the
3636
3737
## Visual Studio 2017
3838

39-
Refer to [Tutorial Step 0: install Python support in Visual Studio 2017](vs-tutorial-01-00.md).
39+
1. Download and run the latest Visual Studio 2017 installer:
40+
41+
> [!div class="nextstepaction"]
42+
> <a target="frameTarget" href="https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15&utm_source=docs&utm_medium=clickbutton&utm_campaign=python_gettingstarted">Install Visual Studio 2017 Community</a>
43+
44+
>[!Tip]
45+
> The Community edition is for individual developers, classroom learning, academic research, and open source development. For other uses, install <a target="frameTarget" href="https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Professional&rel=15&utm_source=docs&utm_medium=clickbutton&utm_campaign=python_gettingstarted">Visual Studio 2017 Professional</a> or <a target="frameTarget" href="https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Enterprisel&rel=15&utm_source=docs&utm_medium=clickbutton&utm_campaign=python_gettingstarted">Visual Studio 2017 Enterprise</a>.
46+
47+
1. The installer presents you with a list of workloads, which are groups of related options for specific development areas. For Python, select the **Python development** workload.
48+
49+
![Python development workload in the Visual Studio installer](media/installation-python-workload.png)
50+
51+
Optional: if you're working with data science, also consider the **Data science and analytical applications** workload. This workload includes support for Python as well as the R and F# languages. For more information, see [Data science and analytical applications workload](../rtvs/data-science-workload.md).
52+
53+
> [!Note]
54+
> The Python and Data Science workloads are available only with Visual Studio 2017 release 15.2 and later.
55+
56+
1. On the right side of the installer, chose additional options if desired. Skip this step to accept the default options.
57+
58+
![Python development options in the Visual Studio installer](media/installation-python-options.png)
59+
60+
| Option | Description |
61+
| --- | --- |
62+
| Python distributions | Choose any combination of the 32-bit and 64-bit variants of the Python 2, Python 3, Anaconda2, and Anaconda3 distributions that you plan to work with. Each includes the distribution's interpreter, runtime, and libraries. Anaconda, specifically, is an open data science platform that includes a wide range of packages. (You can return to the Visual Studio installer at any time to add or remove distributions.) |
63+
| Cookiecutter template support | Installs the Cookicutter graphical UI to discover templates, input template options, and create projects and files. See [Using the Cookicutter extension](cookiecutter.md). |
64+
| Python web support | Installs tools for web development including HTML, CSS, and JavaScript editing support, along with templates for projects using the Bottle, Flask, and Django frameworks. See [Python web project templates](template-web.md). |
65+
| Python IoT support | Supports Windows IoT Core development using Python. |
66+
| Python native development tools | Installs the C++ compiler and other necessary components to develop native extensions for Python. See [Creating a C++ extension for Python](cpp-and-python.md). |
67+
| Azure Cloud Services core tools | Provides additional support for developer Azure Cloud Services in Python. See [zure Cloud Service Projects](template-azure-cloud-service.md). |
68+
69+
1. After installation, the installer provides options to modify, launch, repair, or uninstall Visual Studio. The **Modify** button changes to **Update** when updates to Visual Studio when updates are available for any installed components. (The modify option is then available on the drop-down menu.) You can also launch Visual Studio and the installer from the Windows Start menu by searching on "Visual Studio".
70+
71+
![Launching, modifying, modifying, or uninstalling Visual Studio from the installer](media/installation-vs-launch.png)
4072

4173

4274
## Visual Studio 2015
@@ -88,3 +120,5 @@ where:
88120
### User-specific installations (1.5 and earlier)
89121

90122
Python Tools for Visual Studio 1.5 and earlier allowed installation for the current user only, in which case the installation path is `%LocalAppData%\Microsoft\VisualStudio\<VS_ver>\Extensions\Microsoft\Python Tools for Visual Studio\<PTVS_ver>` where &lt;VS_ver&gt; and &lt;PTVS_ver&gt; are the same as described above.
123+
124+
<iframe src="" height="0" width="0" frameborder="0" name="frameTarget" />

docs/python/publishing-to-azure.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ Publishing to Azure App Service from Visual Studio 2017 copies only the files in
107107
<add key="WSGI_HANDLER" value="app.wsgi_app()"/>
108108
```
109109

110-
- **Flask**: Change the `WSGI_HANDLER` value to `<project_name>.app` where `<project_name>` matches the name of your project. You can find the exact identifer by looking at the `from <project_name> import app` statement in the `runserver.py`. For example, if the project is named "FlaskExample", the entry would appear as follows:
110+
- **Flask**: Change the `WSGI_HANDLER` value to `<project_name>.app` where `<project_name>` matches the name of your project. You can find the exact identifer by looking at the `from <project_name> import app` statement in the `runserver.py`. For example, if the project is named "FlaskAzurePublishExample", the entry would appear as follows:
111111

112112
```xml
113113
<!-- Flask apps only: change the project name to match your app -->
114-
<add key="WSGI_HANDLER" value="FlaskAzurePublishExample.App"/>
114+
<add key="WSGI_HANDLER" value="FlaskAzurePublishExample.app"/>
115115
```
116116

117117
- **Django**: Two changes are needed to `web.config` for Django apps. First, change the `WSGI_HANDLER` value to `django.core.wsgi.get_wsgi_application()` (the object is in the `wsgi.py` file):

docs/python/vs-tutorial-01-00.md

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Working with Python in Visual Studio, Step 0 - Installation | Microsoft Docs
33
ms.custom: ""
4-
ms.date: 9/26/2017
4+
ms.date: 10/9/2017
55
ms.reviewer: ""
66
ms.suite: ""
77
ms.technology:
@@ -18,32 +18,17 @@ manager: "ghogen"
1818

1919
# Install Python support in Visual Studio
2020

21-
Visual Studio 2017 supports Python development with easy-to-install options in the Visual Studio installer. Here's how.
21+
1. Download and run the latest Visual Studio 2017 installer (Python support is present in release 15.2 and later):
2222

23-
1. Download and run the latest Visual Studio 2017 installer from [visualstudio.com](https://www.visualstudio.com/downloads). Python is supported in all editions of Visual Studio 2017 release 15.3 and higher; it may not appear with earlier release channels.
23+
> [!div class="nextstepaction"]
24+
> <a target="frameTarget" href="https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15&utm_source=docs&utm_medium=clickbutton&utm_campaign=python_gettingstarted">Install Visual Studio 2017 Community</a>
2425
25-
1. The installer presents you with a list of workloads, which are groups of related options for specific development areas. For Python, select the **Python development** workload.
26+
>[!Tip]
27+
> The Community edition is for individual developers, classroom learning, academic research, and open source development. For other uses, install <a target="frameTarget" href="https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Professional&rel=15&utm_source=docs&utm_medium=clickbutton&utm_campaign=python_gettingstarted">Visual Studio 2017 Professional</a> or <a target="frameTarget" href="https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Enterprisel&rel=15&utm_source=docs&utm_medium=clickbutton&utm_campaign=python_gettingstarted">Visual Studio 2017 Enterprise</a>.
2628
27-
![Python development workload in the Visual Studio installer](media/installation-python-workload.png)
28-
29-
Optional: if you're working with data science, also consider the **Data science and analytical applications** workload. This workload includes support for Python as well as the R and F# languages. For more information, see [Data science and analytical applications workload](../rtvs/data-science-workload.md).
30-
31-
1. On the right side of the installer, chose additional options if desired. Skip this step to accept the default options.
32-
33-
![Python development options in the Visual Studio installer](media/installation-python-options.png)
29+
1. The installer presents you with a list of workloads, which are groups of related options for specific development areas. For Python, select the **Python development** workload and select **Install**:
3430

35-
| Option | Description |
36-
| --- | --- |
37-
| Python distributions | Choose any combination of the 32-bit and 64-bit variants of the Python 2, Python 3, Anaconda2, and Anaconda3 distributions that you plan to work with. Each includes the distribution's interpreter, runtime, and libraries. Anaconda, specifically, is an open data science platform that includes a wide range of packages. (You can return to the Visual Studio installer at any time to add or remove distributions.) |
38-
| Cookiecutter template support | Installs the Cookicutter graphical UI to discover templates, input template options, and create projects and files. See [Using the Cookicutter extension](cookiecutter.md). |
39-
| Python web support | Installs tools for web development including HTML, CSS, and JavaScript editing support, along with templates for projects using the Bottle, Flask, and Django frameworks. See [Python web project templates](template-web.md). |
40-
| Python IoT support | Supports Windows IoT Core development using Python. |
41-
| Python native development tools | Installs the C++ compiler and other necessary components to develop native extensions for Python. See [Creating a C++ extension for Python](cpp-and-python.md). |
42-
| Azure Cloud Services core tools | Provides additional support for developer Azure Cloud Services in Python. See [zure Cloud Service Projects](template-azure-cloud-service.md). |
43-
44-
1. After installation, the installer provides options to modify, launch, repair, or uninstall Visual Studio. The **Modify** button changes to **Update** when updates to Visual Studio when updates are available for any installed components. (The modify option is then available on the drop-down menu.) You can also launch Visual Studio and the installer from the Windows Start menu by searching on "Visual Studio".
45-
46-
![Launching, modifying, modifying, or uninstalling Visual Studio from the installer](media/installation-vs-launch.png)
31+
![Python development workload in the Visual Studio installer](media/installation-python-workload.png)
4732

4833
1. To quickly test Python support, launch Visual Studio, press Alt+I to open the Python Interactive window, and enter `2+2`. If you don't see the output of `4`, recheck your steps.
4934

@@ -59,3 +44,5 @@ Visual Studio 2017 supports Python development with easy-to-install options in t
5944
- [Creating an environment for an existing Python interpreter](python-environments.md#creating-an-environment-for-an-existing-interpreter).
6045
- [Install Python support in Visual Studio 2015 and earlier](installation.md).
6146
- [Install locations](installation.md#install-locations).
47+
48+
<iframe src="" height="0" width="0" frameborder="0" name="frameTarget" />

0 commit comments

Comments
 (0)