Update remaining references from mamba to conda

Author: englehardt

README.md

@@ -33,19 +33,16 @@ the instrumentation section below for more details.
 
 OpenWPM is tested on Ubuntu 18.04 via GitHub actions and is commonly used via the docker container
 that this repo builds, which is also based on Ubuntu. Although we don't officially support
-other platforms, mamba is a cross platform utility and the install script can be expected
+other platforms, conda is a cross platform utility and the install script can be expected
 to work on OSX and other linux distributions.
 
 OpenWPM does not support windows: <https://github.com/openwpm/OpenWPM/issues/503>
 
 ### Pre-requisites
 
-The main pre-requisite for OpenWPM is mamba, a fast cross-platform package management tool.
+The main pre-requisite for OpenWPM is conda, a fast cross-platform package management tool.
 
-Mamba is open-source, and can be installed from <https://mamba.readthedocs.io/en/latest/installation.html>.
-
-Mamba is a reimplmentation of conda and so sometimes a conda command has to be invoked instead of the mamba
-one.
+Conda is open-source and can be installed from <https://docs.conda.io/projects/conda/en/latest/user-guide/install/index.html>.
 
 ### Install
 

install.sh

@@ -14,7 +14,7 @@
 # conda environment if it exists.
 
 # Arguments:
-# --skip-create: Doesn't change the openwpm mamba environment
+# --skip-create: Doesn't change the openwpm conda environment
 
 
 set -e
@@ -29,10 +29,10 @@ if [ "$1" != "--skip-create" ]; then
   case "$(uname -s)" in
   Darwin)
     echo '...using the osx-64 channel for MacOS dependencies'
-    CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True mamba env create -q -f environment.yaml
+    CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create -q -f environment.yaml
     ;;
   *)
-    PYTHONNOUSERSITE=True mamba env create -q -f environment.yaml
+    PYTHONNOUSERSITE=True conda env create -q -f environment.yaml
     ;;
   esac
 

scripts/install-conda.sh

@@ -1,12 +1,10 @@
 #!/bin/bash
 
-# This script installs mamba.
+# This script installs conda.
 # It is only intended for use by travis and docker container
 
-# Users/Developers should install mamba themselves
-# via the instructions at https://mamba.readthedocs.io/en/latest/installation.html
-# Mamba has been chosen as a replacement for conda as it performs much faster
-# and consumes less resources
+# Users/Developers should install conda themselves
+# via the instructions at https://docs.conda.io/projects/conda/en/latest/user-guide/install/index.html
 
 # Ref: https://docs.conda.io/projects/conda/en/latest/user-guide/tasks/use-conda-with-travis-ci.html
 wget -q "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh" -O conda.sh;

scripts/repin.sh

@@ -2,11 +2,11 @@
 
 # This script re-creates environment.yaml
 # This script will remove an existing openwpm
-# mamba environment if it exists.
+# conda environment if it exists.
 
 set -e
 
-# Make mamba available to shell script
+# Make conda available to shell script
 eval "$(conda shell.bash hook)"
 
 # Create openwpm env with unpinned yaml file
@@ -15,10 +15,10 @@ eval "$(conda shell.bash hook)"
 case "$(uname -s)" in
 Darwin)
   echo 'Using the osx-64 channel for MacOS dependencies...'
-  CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True mamba env create -q -f environment-unpinned.yaml
+  CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env create -q -f environment-unpinned.yaml
   ;;
 *)
-  PYTHONNOUSERSITE=True mamba env create -q -f environment-unpinned.yaml
+  PYTHONNOUSERSITE=True conda env create -q -f environment-unpinned.yaml
   ;;
 esac
 
@@ -29,16 +29,16 @@ conda activate openwpm
 case "$(uname -s)" in
 Darwin)
   echo 'Using the osx-64 channel for MacOS dependencies...'
-  CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True mamba env update -f environment-unpinned-dev.yaml
+  CONDA_SUBDIR=osx-64 PYTHONNOUSERSITE=True conda env update -f environment-unpinned-dev.yaml
   ;;
 *)
-  PYTHONNOUSERSITE=True mamba env update -f environment-unpinned-dev.yaml
+  PYTHONNOUSERSITE=True conda env update -f environment-unpinned-dev.yaml
   ;;
 esac
 
 
 # Export the environment including manually specify channels
-mamba env export --no-builds --override-channels -c conda-forge -c main -f ../environment.yaml
+conda env export --no-builds --override-channels -c conda-forge -c main -f ../environment.yaml
 
 # Prune environment file to only things we want to pin
 python prune-environment.py