From f0d3580679438fa9085354dbe85960dc4689b0ba Mon Sep 17 00:00:00 2001 From: Alec Jacobson Date: Tue, 15 Aug 2023 14:31:07 -0400 Subject: [PATCH] rm conda --- .github/workflows/gh-pages.yml | 20 +++--- conda.yml | 15 ----- docs/website.md | 109 ++------------------------------- 3 files changed, 14 insertions(+), 130 deletions(-) delete mode 100644 conda.yml diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 05d4a2ca7..edd2036b1 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -14,19 +14,17 @@ jobs: with: fetch-depth: 1 - - name: Setup Conda - uses: conda-incubator/setup-miniconda@v2 - with: - activate-environment: libigl-website - environment-file: conda.yml - auto-activate-base: false + - name: Setup Python 🐍 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + cache: 'pip' # caching pip dependencies + - run: pip install -r requirements.txt - - name: Build website + - name: Build website 🛠 shell: bash - run: | - eval "$(conda shell.bash hook)" - conda activate libigl-website - mkdocs build + run: mkdocs build - name: Deploy to GH Pages 🚀 uses: peaceiris/actions-gh-pages@v3 diff --git a/conda.yml b/conda.yml deleted file mode 100644 index 6a324f39b..000000000 --- a/conda.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: libigl-website -channels: - - conda-forge -dependencies: - - python=3.10 - - mkdocs=1.2.4 - - mkdocs-material=8.2.7 - - mkdocs-macros-plugin=0.7.0 - - pygments=2.11.2 - - pymdown-extensions=9.3 - - pip=22.0.4 - - pip: - - mkdocs-redirects==1.0.3 - - mkdocs-minify-plugin==0.4.0 - - LinkChecker==10.1.0 diff --git a/docs/website.md b/docs/website.md index 07cefdb0d..8a1bc80e6 100644 --- a/docs/website.md +++ b/docs/website.md @@ -29,113 +29,15 @@ If you want to preview the website locally on your machine, you will need to run ### Prerequisites -#### Install Conda - -If you do not already have it, install [miniconda](https://docs.conda.io/en/latest/miniconda.html) on your machine. - -??? info "Instructions for Windows" - - - Option 1: Using [Chocolatey](https://chocolatey.org/): - ``` - choco install -y miniconda3 - ``` - - - Option 2: Using [Scoop](https://scoop.sh/): - ```bash - # Add the extras bucket - scoop bucket add extras - scoop install miniconda3 - ``` - - - Option 3: [Manual Installation](https://conda.io/projects/conda/en/latest/user-guide/install/windows.html) - -??? info "Instructions for macOS" - - - Option 1: Using Homebrew Cask: - ```bash - brew cask install miniconda - ``` - - - Option 2: [Manual Installation](https://conda.io/projects/conda/en/latest/user-guide/install/macos.html) - ```bash - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh - bash Miniconda3-latest-MacOSX-x86_64.sh - ``` - -??? info "Instructions for Ubuntu/Debian" - - 1. Download the public GPG key and add the conda repository to the sources list - ```bash - # Install our public GPG key to trusted store - curl https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc | gpg --dearmor > conda.gpg - install -o root -g root -m 644 conda.gpg /usr/share/keyrings/conda-archive-keyring.gpg - - # Check whether fingerprint is correct (will output an error message otherwise) - gpg --keyring /usr/share/keyrings/conda-archive-keyring.gpg --no-default-keyring --fingerprint 34161F5BF5EB1D4BFBBB8F0A8AEB4F8B29D82806 - - # Add our Debian repo - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" > /etc/apt/sources.list.d/conda.list - - **NB:** If you receive a Permission denied error when trying to run the above command (because `/etc/apt/sources.list.d/conda.list` is write protected), try using the following command instead: - echo "deb [arch=amd64 signed-by=/usr/share/keyrings/conda-archive-keyring.gpg] https://repo.anaconda.com/pkgs/misc/debrepo/conda stable main" | sudo tee -a /etc/apt/sources.list.d/conda.list - ``` - - 2. Install the conda package manager: - ```bash - # Install it! - apt update - apt install conda - ``` - -??? info "Instructions for RedHat/CentOS/Fedora" - - 1. Download the GPG key and add a repository configuration file for conda - ```bash - # Import our GPG public key - rpm --import https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc - - # Add the Anaconda repository - cat < /etc/yum/repos.d/conda.repo - [conda] - name=Conda - baseurl=https://repo.anaconda.com/pkgs/misc/rpmrepo/conda - enabled=1 - gpgcheck=1 - gpgkey=https://repo.anaconda.com/pkgs/misc/gpgkeys/anaconda.asc - EOF - ``` - - 2. Install the conda package manager: - ``` - yum install conda - ``` - -??? info "Instructions for generic Linux" - - - [Manual installation](https://conda.io/projects/conda/en/latest/user-guide/install/linux.html): - ```bash - wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh - bash Miniconda3-latest-Linux-x86_64.sh - ``` - -#### Create/Update Conda Environment - -``` -conda env update -f conda.yml +```bash +python -m pip install -r requirements.txt ``` - ### Render the Website -1. Activate the conda environment installed on the previous step: - ```bash - conda activate libigl-website - ``` - -2. Preview the website locally (run this command in the root folder of the libigl project): - ```bash - mkdocs serve - ``` +```bash +mkdocs serve +``` !!! tip @@ -151,6 +53,5 @@ Deployment has been automated through the use of GitHub Actions. The configurati ## References -- [Miniconda](https://docs.conda.io/en/latest/miniconda.html) - [MkDocs](http://www.mkdocs.org/) - [Material Theme](https://squidfunk.github.io/mkdocs-material/)