From 54b5b2a7c5ca3223ddf8f11d814ca42a52333a53 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 22 Feb 2019 11:07:18 +0100
Subject: [PATCH] [web] Unified Python and Conan install instructions.
---
.../getting-started/prerequisites.pandoc | 44 +++++++++++--------
1 file changed, 25 insertions(+), 19 deletions(-)
diff --git a/web/content/docs/devguide/getting-started/prerequisites.pandoc b/web/content/docs/devguide/getting-started/prerequisites.pandoc
index 1861ed3afe4..6ba23ddd84a 100644
--- a/web/content/docs/devguide/getting-started/prerequisites.pandoc
+++ b/web/content/docs/devguide/getting-started/prerequisites.pandoc
@@ -197,45 +197,51 @@ $ brew install cmake
```
:::
-## Step: Install Conan package manager
-
-The [Conan package manager](https://www.conan.io) helps to install all required libraries in a convenient way on every platform. If you prefer you can also [install libraries manually]({{< ref "third-party-libraries.pandoc" >}}) instead.
-
-Go to [Conans download page](https://www.conan.io/downloads) and see platform-specific instructions:
+## Step: Install Python 3
::: {.win}
-Just use the provided Windows installer and make sure to add conan to your path environment as asked by the installer.
-Check on a newly opened command line if Conan was installed successfully:
+- [Download the Python 3 installer](https://www.python.org/ftp/python/3.7.2/python-3.7.2-amd64-webinstall.exe)
+- Install with the following options
+ - Check *Add Python 3.X to PATH*
+ - *Customize installation*
+ - Make sure to have `pip` enabled (you may uncheck *Documentation*, *tcl/tk*, *Python test suite*)
+ - You may check *Install for all users*
+ - Check *Add Python to environment variables*!
-```bash
-$ conan --version
-Conan version 1.0.4
-```
:::
::: {.linux}
-Use either the provided deb-package or install via Pythons `pip`.
-Check on a newly opened command line if Conan was installed successfully:
+Install Python 3 and pip:
```bash
-$ conan --version
-Conan version 1.0.4
+sudo apt-get install python3 python3-pip
```
+
:::
::: {.mac}
-Use Homebrew:
+Install Python 3 with Homebrew:
```bash
-brew install conan
+brew install python
+```
+:::
+
+## Step: Install Conan package manager
+
+The [Conan package manager](https://www.conan.io) helps to install all required libraries in a convenient way on every platform. If you prefer you can also [install libraries manually]({{< ref "third-party-libraries.pandoc" >}}) instead.
+
+Install Conan with Python's pip:
+
+```bash
+pip3 install --user conan
```
Check on a newly opened command line if Conan was installed successfully:
```bash
$ conan --version
-Conan version 1.0.4
+Conan version 1.12.3
```
-:::
--
GitLab