From c3dd53177334d23d209ecf6164fbda4217195ef4 Mon Sep 17 00:00:00 2001
From: Marvin Albert <marvin.albert@gmail.com>
Date: Thu, 29 Jun 2023 08:25:19 +0200
Subject: [PATCH] WIP
---
README.md | 8 +++++---
book/install_python.md | 8 ++++----
book/setup_environment.md | 4 ++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 0ed7c5b..e1b5a63 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
- Guided walk-through
- Exercises
-Good slides available [here](https://docs.google.com/presentation/d/1u_FraZPABjCdzNj_2Oq5i7FxWbGPdIkbtCKXzxAORwA/edit?usp=sharing).
+The slides are available [here](https://docs.google.com/presentation/d/1u_FraZPABjCdzNj_2Oq5i7FxWbGPdIkbtCKXzxAORwA/edit?usp=sharing).
## This repository
@@ -43,9 +43,11 @@ The Mybinder and Renkulab sessions are only temporary, i.e. changes you make to
## Acknowledgements / Copyright
-The material for this course and this repository has been copied from [this course](https://github.com/guiwitz/PyImageCourse_beginner) created by Guillaume Witz [](https://zenodo.org/badge/latestdoi/173477371). All credit goes to Guillaume Witz.
+The material for this course have been modified from
+[this](https://github.com/guiwitz/PyImageCourse_beginner) [](https://zenodo.org/badge/latestdoi/173477371) (notebooks) and
+[this](https://github.com/guiwitz/neubias_academy_biapy) [](https://zenodo.org/badge/latestdoi/261601095) (slides) course, both created by [Guillaume Witz](https://twitter.com/guiwitz). Thank you for making this teaching material available to the community.
-Installation instructions have been taken from the [Open Image Data Handbook](https://kevinyamauchi.github.io/open-image-data/intro.html) by Kevin Yamauchi.
+Installation instructions have been modified from the [Open Image Data Handbook](https://kevinyamauchi.github.io/open-image-data/intro.html) by [Kevin Yamauchi](https://kevinyamauchi.github.io/). Thank you.
## Data
diff --git a/book/install_python.md b/book/install_python.md
index b4900c4..77adf21 100644
--- a/book/install_python.md
+++ b/book/install_python.md
@@ -8,7 +8,7 @@ This how-to teaches how to install Python on your computer using `conda`, which
### `conda` and `mamba`
-There is one problem with conda: Its default package manager is very slow. Instead, using `conda` in combination with the package manager [`mamba` package manager](https://mamba.readthedocs.io/en/latest/index.html) saves a lot of time when installing new packages. The version of `conda` which includes this package manager is called `mambaforge`.
+There is one problem with conda: Its default package manager is very slow. Instead, using `conda` in combination with the package manager [`mamba`](https://mamba.readthedocs.io/en/latest/index.html) saves a lot of time when installing new packages. The version of `conda` which includes this package manager is called `mambaforge`.
**Prerequisites**
- You have a computer with linux, MacOS, or Windows installed
@@ -51,7 +51,7 @@ Select the installation instructions for your operating system and processor fro
```
```{tab-item} Mac OS (Intel)
-1. In your web browser, navigate to the [miniforge page](https://github.com/conda-forge/miniforge#mambaforge).
+1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#mambaforge).
2. Scroll down to the "Mambaforge" header of the "Downloads" section. Click the link to download link for `Mambaforge-MacOSX-x86_64`.
3. Open your Terminal (you can search for it in spotlight - `cmd` + `space`)
4. Navigate to the folder you downloaded the installer to (usually this is in your Downloads folder). If the file was downloaded to your Downloads folder, you would enter:
@@ -79,7 +79,7 @@ Select the installation instructions for your operating system and processor fro
```
```{tab-item} Mac OS (M1/M2)
-1. In your web browser, navigate to the [miniforge page](https://github.com/conda-forge/miniforge#mambaforge).
+1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#mambaforge).
2. Scroll down to the "Mambaforge" header of the "Downloads" section. Click the link to download link for `Mambaforge-MacOSX-arm64`.
3. Open your Terminal (you can search for it in spotlight - `cmd` + `space`)
4. Navigate to the folder you downloaded the installer to (usually this is in your Downloads folder). If the file was downloaded to your Downloads folder, you would enter:
@@ -107,7 +107,7 @@ Select the installation instructions for your operating system and processor fro
```
```{tab-item} Windows
-1. In your web browser, navigate to the [miniforge page](https://github.com/conda-forge/miniforge#mambaforge).
+1. In your web browser, navigate to this [download page](https://github.com/conda-forge/miniforge#mambaforge).
2. Scroll down to the "Mambaforge" header of the "Downloads" section. Click the link to download link for `Mambaforge-Windows-x86_64`.
3. Find the file you downloaded (Mambaforge-Windows-x86_64.exe) and double click to execute it. Follow the instructions to complete the installation.
4. Once the installation has completed, you can verify it was correctly installed by searching for the "mambaforge prompt" in your Start menu.
diff --git a/book/setup_environment.md b/book/setup_environment.md
index d554a07..b40863a 100644
--- a/book/setup_environment.md
+++ b/book/setup_environment.md
@@ -64,13 +64,13 @@ The following assumes that you have installed python using Mambaforge as [descri
3. The file `environment.yml` contains the dependencies needed to run the notebooks, and it specifies a `conda` environment named `pyimagecourse`. Create this environment from the file by entering the following command.
```bash
- mamba create --file environment.yml
+ mamba env create --file environment.yml
```
4. Once the environment setup has finished, activate the environment. If you successfully activated the environment, you should now see `(pyimagecourse)` to the left of your command prompt.
```bash
- mamba activate pyimagecourse
+ conda activate pyimagecourse
```
--
GitLab