Skip to content

Commit 8f30a39

Browse files
committed
Use builtin miniconda
1 parent 6afc9e6 commit 8f30a39

File tree

4 files changed

+20
-190
lines changed

4 files changed

+20
-190
lines changed

appveyor.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,7 @@ environment:
1111
PYTHONWARNINGS: 'ignore:::wheel.pep425tags:'
1212
PYTHONPATH: C:\testdir
1313
NUNIT: nunit3-console
14-
CONDA_BLD: C:\conda
15-
CONDA_BLD_VERSION: 3.5
16-
17-
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
18-
# /E:ON and /V:ON options are not enabled in the batch script interpreter
19-
# See: http://stackoverflow.com/a/13751649/163740
20-
CMD_IN_ENV: 'cmd /E:ON /V:ON /C .\ci\run_with_env.cmd'
14+
CONDA_BLD: C:\miniconda35
2115

2216
matrix:
2317
- PYTHON_VERSION: 2.7
@@ -37,6 +31,7 @@ init:
3731
- if %PLATFORM%==x86 (set CONDA_BLD_ARCH=32)
3832
# - if %PLATFORM%==x86 (set NUNIT=%NUNIT%-x86)
3933
- if %PLATFORM%==x64 (set PYTHON=%PYTHON%-x64)
34+
- if %PLATFORM%==x64 (set CONDA_BLD=%CONDA_BLD%-x64)
4035

4136
# Prepend newly installed Python to the PATH of this build
4237
- set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%

ci/appveyor_build_recipe.ps1

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
2-
Invoke-Expression .\ci\install_miniconda.ps1
3-
&"$env:CONDA_BLD\Scripts\conda" build conda.recipe --dirty -q
4-
$CONDA_PKG=(&"$env:CONDA_BLD\Scripts\conda" build conda.recipe --output -q)
2+
# Update PATH, and keep a copy to restore at end of this PowerShell script
3+
$old_path = $env:path
4+
$env:path = "$env:CONDA_BLD;$env:CONDA_BLD\Scripts;" + $env:path
5+
6+
Write-Host "Starting Conda Update/Install" -ForegroundColor "Green"
7+
conda update conda -q -y
8+
conda install conda-build jinja2 anaconda-client -q -y
9+
10+
Write-Host "Starting Conda Recipe build" -ForegroundColor "Green"
11+
conda build conda.recipe -q --dirty
12+
13+
$CONDA_PKG=(conda build conda.recipe -q --output)
514
Copy-Item $CONDA_PKG "$env:APPVEYOR_BUILD_FOLDER\dist\"
15+
Write-Host "Completed Conda Recipe build" -ForegroundColor "Green"
16+
17+
# Restore PATH back to original
18+
$env:path = $old_path
19+
} else {
20+
Write-Host "Skipping Conda Recipe build" -ForegroundColor "Green"
621
}

ci/install_miniconda.ps1

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

ci/run_with_env.cmd

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

0 commit comments

Comments
 (0)