Fix typo (#1176)
* Fix typo * Update quickstart.rst * ezdxf workaround * Use latest mambaforge * Fix the appveyor fix * Simplify appveyor * Fix readthedocs After https://docs.readthedocs.io/en/stable/guides/conda.html * Fix activate on linux Co-authored-by: AU <adam-urbanczyk@users.noreply.github.com>
This commit is contained in:
@ -1,3 +1,9 @@
|
||||
version: 2
|
||||
|
||||
build:
|
||||
os: "ubuntu-20.04"
|
||||
tools:
|
||||
python: "mambaforge-4.10"
|
||||
|
||||
conda:
|
||||
environment: environment.yml
|
||||
|
||||
14
appveyor.yml
14
appveyor.yml
@ -6,7 +6,7 @@ platform:
|
||||
environment:
|
||||
matrix:
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
|
||||
MINICONDA_DIRNAME: C:\Miniconda38-x64
|
||||
MINICONDA_DIRNAME: C:\Miniforge
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
|
||||
OS: Linux
|
||||
- APPVEYOR_BUILD_WORKER_IMAGE: macOS
|
||||
@ -16,17 +16,17 @@ environment:
|
||||
secure: $(anaconda_token)
|
||||
|
||||
init:
|
||||
- cmd: curl -fsSLo Miniforge.exe https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe
|
||||
- cmd: Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=%MINICONDA_DIRNAME%
|
||||
- cmd: set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
|
||||
- sh: curl -sL https://repo.anaconda.com/miniconda/Miniconda3-latest-$OS-x86_64.sh > miniconda.sh
|
||||
- cmd: activate
|
||||
- sh: curl -sL https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$OS-x86_64.sh > miniconda.sh
|
||||
- sh: bash miniconda.sh -b -p $HOME/miniconda;
|
||||
- sh: export PATH="$HOME/miniconda/bin:$HOME/miniconda/lib:$PATH";
|
||||
- sh: source $HOME/miniconda/bin/activate
|
||||
- sh: source $HOME/miniconda/bin/activate
|
||||
|
||||
install:
|
||||
- conda config --set always_yes yes --set changeps1 no
|
||||
- conda update -q conda
|
||||
- cmd: conda init cmd.exe
|
||||
- conda env create -f environment.yml
|
||||
- mamba env create -f environment.yml
|
||||
- conda activate cadquery
|
||||
- pip install git+https://github.com/CadQuery/OCP-stubs.git@7.6.3
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ Let's see how we do.
|
||||
Start With A single, simple Plate
|
||||
======================================
|
||||
|
||||
Lets start with a simple model that makes nothing but a rectangular block, but
|
||||
Let's start with a simple model that makes nothing but a rectangular block, but
|
||||
with place-holders for the dimensions. Paste this into the code editor:
|
||||
|
||||
.. code-block:: python
|
||||
@ -96,7 +96,7 @@ Rebuild your model by clicking the Render button. Your block should look like th
|
||||
.. image:: _static/quickstart/003.png
|
||||
|
||||
|
||||
The code is pretty compact, lets step through it.
|
||||
The code is pretty compact, let's step through it.
|
||||
|
||||
**Line 4** adds a new parameter, diameter, for the diameter of the hole
|
||||
|
||||
@ -156,7 +156,7 @@ After clicking the Render button to re-execute the model, you should see somethi
|
||||
.. image:: _static/quickstart/004.png
|
||||
|
||||
|
||||
There is quite a bit going on here, so lets break it down a bit.
|
||||
There is quite a bit going on here, so let's break it down a bit.
|
||||
|
||||
**Line 5** creates a new padding parameter that decides how far the holes are from the edges of the plate.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user