Skip to content

Commit

Permalink
[ci] remove temp fix and fix activation for conda (#2280)
Browse files Browse the repository at this point in the history
* removed temp fix for conda

* fixed conda activation before any conda command
  • Loading branch information
StrikerRUS committed Jul 24, 2019
1 parent e1d7a7b commit ee28ea3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .appveyor.yml
@@ -1,4 +1,4 @@
version: 2.2.4.{build}
version: 2.2.4.{build}

image: Visual Studio 2015
platform: x64
Expand Down Expand Up @@ -27,8 +27,9 @@ install:
}
- set PATH=%MINICONDA%;%MINICONDA%\Scripts;%PATH%
- ps: $env:LGB_VER = (Get-Content VERSION.txt).trim()
- activate
- conda config --set always_yes yes --set changeps1 no
- conda install -q -y conda=4.6.14 # temp fix, change to update later
- conda update -q -y conda
- conda create -q -y -n test-env python=%PYTHON_VERSION% matplotlib numpy pandas psutil pytest python-graphviz scikit-learn scipy
- activate test-env
- set PATH=%CONDA_PREFIX%\Library\bin\graphviz;%PATH% # temp graphviz hotfix
Expand Down
2 changes: 1 addition & 1 deletion .ci/setup.sh
Expand Up @@ -57,4 +57,4 @@ if [[ $TRAVIS == "true" ]] || [[ $OS_NAME == "macos" ]]; then
sh conda.sh -b -p $CONDA
fi
conda config --set always_yes yes --set changeps1 no
conda install -q -y conda=4.6.14 # temp fix, change to update later
conda update -q -y conda
3 changes: 1 addition & 2 deletions .vsts-ci.yml
Expand Up @@ -127,8 +127,7 @@ jobs:
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
displayName: Enable conda
- script: |
conda install -q -y conda=4.6.14
conda create -q -y -n %CONDA_ENV% python=%PYTHON_VERSION% matplotlib numpy pandas psutil pytest python-graphviz scikit-learn scipy
cmd /c "activate & conda config --set always_yes yes --set changeps1 no & conda update -q -y conda & conda create -q -y -n %CONDA_ENV% python=%PYTHON_VERSION% matplotlib numpy pandas psutil pytest python-graphviz scikit-learn scipy"
cmd /c "activate %CONDA_ENV% & powershell -ExecutionPolicy Bypass -File %BUILD_SOURCESDIRECTORY%/.ci/test_windows.ps1"
displayName: Test
- task: PublishBuildArtifacts@1
Expand Down

0 comments on commit ee28ea3

Please sign in to comment.