Skip to content

Commit

Permalink
Fix conda permissions and install everything from conda-forge in Azur…
Browse files Browse the repository at this point in the history
…e and Circle
  • Loading branch information
ccordoba12 committed Jun 19, 2020
1 parent af6c93d commit f4e5e0e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 21 deletions.
11 changes: 3 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,14 @@ jobs:
versionSpec: '$(python.version)'
architecture: 'x64'

# Install nodejs version 13.x
- task: NodeTool@0
inputs:
versionSpec: '13.x'

- script: sudo chown -R 501:20 /Users/runner/.conda
displayName: Fix .conda permissions

- script: sudo install -d -m 0777 /usr/local/miniconda/envs/
- script: sudo install -d -m 0777 /usr/local/envs/
displayName: Fix conda env permissions

- script: sudo chown -R 501:20 /usr/local/miniconda/pkgs
displayName: Fix Conda pkgs permissions
- script: sudo chown -R 501:20 /usr/local/miniconda/
displayName: Fix miniconda permissions

# Conda setup environment.
# https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/package/conda-environment?view=vsts
Expand Down
6 changes: 3 additions & 3 deletions continuous_integration/azure/install.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ if %USE_CONDA% == yes (
conda install -q -y python=3.6.8=h9f7ef89_7
)

conda install -q -y -c spyder-ide --file requirements/conda_win.txt
conda install -q -y -c conda-forge --file requirements/conda_win.txt
if errorlevel 1 exit 1

conda install -q -y -c spyder-ide --file requirements/tests.txt
conda install -q -y -c conda-forge --file requirements/tests.txt
if errorlevel 1 exit 1

conda install -q -y -c conda-forge nodejs
conda install -q -y -c conda-forge nodejs
if errorlevel 1 exit 1

conda install -q -y -c conda-forge yarn
Expand Down
12 changes: 6 additions & 6 deletions continuous_integration/azure/install.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash -ex

# Install dependencies
conda install -q -y -c spyder-ide --file requirements/conda.txt
conda install -q -y -c conda-forge --file requirements/conda.txt

# Install test dependencies
conda install -q -y -c spyder-ide --file requirements/tests.txt
conda install -q -y -c conda-forge --file requirements/tests.txt

if [ $(uname) == Darwin ]; then
conda install -q -y qt=5.9.6
fi
conda install -q -y -c conda-forge nodejs=13

pip install -q codecov
conda install -q -y -c conda-forge yarn

pip install -q codecov
6 changes: 3 additions & 3 deletions continuous_integration/circle/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ conda activate test
conda install -q -y nomkl

# Install dependencies
conda install -q -y -c spyder-ide --file requirements/conda.txt
conda install -q -y -c conda-forge --file requirements/conda.txt

# Install test dependencies
conda install -q -y -c spyder-ide --file requirements/tests.txt
conda install -q -y -c conda-forge --file requirements/tests.txt

# Update to latest version of nodejs using nvm
export NVM_DIR="/opt/circleci/.nvm"
Expand All @@ -31,4 +31,4 @@ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/source
sudo apt-get update && sudo apt-get install yarn
export PATH="$PATH:/opt/yarn-1.17.3/bin"

pip install -q codecov
pip install -q codecov
2 changes: 1 addition & 1 deletion requirements/tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pytest
pytest-cov
flaky
pytest-qt
pytest-timeout
pytest-timeout

0 comments on commit f4e5e0e

Please sign in to comment.