Skip to content

Commit 5434d45

Browse files
authored
Added MacOS and Linux to Appveyor test matrix (#816)
* Added MacOS and Linux to Appveyor test matrix * Fixed a trailing semicolon that was messing Windows up * Still learning how to handle multiple OSes in Appveyor * Trying to switch from wget to curl * Fixed mistake in conda install line * Figured out the the image and matrix sections cause dupes * Fixed env variable ref, added additional checks, Miniconda with Py 3.9 not available * Added conda install lines for black and mypy * Install OCP stubs for Windows too * Ignore missing nlopt imports * Install pytest * Install pytest Coverage plugin * Added path install * Added install for docutils * Added install for codecov * Trying to install mypy via pip instead of conda * Removed Travis CI yaml file * Removed unneeded CQ install and added on-the-fly mypy and black installs * Changes to rely on environment.yml file rather than fighting it * Trying to substitute the version number in the conda environment file * Back to the inefficient version of swapping the Python version after install * Trying to use cygwin to run sed command in Windows * Trying to debug why the Windows substitution does not work * Trying to get environment variable to work in Windows * Trying to get MacOS sed to work like GNU, and checking resulting environment file * Simplification to only test using the latest stable version of Python from conda * Cleaned up yaml file and forced Windows image to use newer Miniconda * Been missing conda on activate this whole time * Trying to fix errors about conda init not being run * Still trying to fix conda init * Windows-specific handling of shell env variable * Trying different variations for passing the shell to init * Trying to use bash specifically for Linux and MacOS * Trying to simulate a shell restart to pick up conda changes * Trying to work around conda activate altogether * Use separate activate lines for *nix and Windows * Moved activate statements * Still fighting conda differences between OSes * Still working on conda init to work on *nix * Cannot get conda activate to work on *nix * Updated activate line for *nix * New conda activate line * Hopefully the last cleanup
1 parent 6a440b6 commit 5434d45

File tree

4 files changed

+22
-87
lines changed

4 files changed

+22
-87
lines changed

.travis.yml

Lines changed: 0 additions & 78 deletions
This file was deleted.

appveyor.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,40 @@
1-
image: Visual Studio 2019
2-
31
shallow_clone: true
42

53
platform:
64
- x64
75

86
environment:
97
matrix:
10-
- PYTHON_VERSION: 3.7
11-
MINICONDA_DIRNAME: C:\Miniconda37-x64
12-
- PYTHON_VERSION: 3.8
8+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
139
MINICONDA_DIRNAME: C:\Miniconda38-x64
10+
- APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
11+
OS: Linux
12+
- APPVEYOR_BUILD_WORKER_IMAGE: macOS
13+
OS: MacOSX
1414

1515
ANACONDA_TOKEN:
1616
secure: $(anaconda_token)
1717

18+
init:
19+
- cmd: set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
20+
- sh: curl -sL https://repo.anaconda.com/miniconda/Miniconda3-latest-$OS-x86_64.sh > miniconda.sh
21+
- sh: bash miniconda.sh -b -p $HOME/miniconda;
22+
- sh: export PATH="$HOME/miniconda/bin:$HOME/miniconda/lib:$PATH";
23+
- sh: source $HOME/miniconda/bin/activate
24+
1825
install:
19-
- set "PATH=%MINICONDA_DIRNAME%;%MINICONDA_DIRNAME%\\Scripts;%PATH%"
20-
- conda config --set always_yes yes
26+
- conda config --set always_yes yes --set changeps1 no
2127
- conda update -q conda
28+
- cmd: conda init cmd.exe
2229
- conda env create -f environment.yml
23-
- activate cadquery
24-
- conda install -c conda-forge -c defaults -c cadquery python=%PYTHON_VERSION%
30+
- conda activate cadquery
31+
- pip install git+https://github.com/CadQuery/[email protected]
2532

2633
build: false
2734

2835
test_script:
36+
- black . --diff --check
37+
- mypy cadquery
2938
- pytest -v --cov
3039

3140
on_success:

environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ dependencies:
1212
- sphinx_rtd_theme
1313
- sphinx-autodoc-typehints
1414
- black=19.10b0
15+
- mypy
1516
- codecov
1617
- pytest
1718
- pytest-cov

mypy.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ ignore_missing_imports = True
1919
[mypy-nptyping.*]
2020
ignore_missing_imports = True
2121

22+
[mypy-nlopt.*]
23+
ignore_missing_imports = True
24+
2225
[mypy-vtk.*]
2326
ignore_missing_imports = True
2427

0 commit comments

Comments
 (0)