diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0dcbd19c..8176dcba 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 diff --git a/continuous_integration/azure/install.bat b/continuous_integration/azure/install.bat index b739df7d..fb6c6d32 100755 --- a/continuous_integration/azure/install.bat +++ b/continuous_integration/azure/install.bat @@ -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 diff --git a/continuous_integration/azure/install.sh b/continuous_integration/azure/install.sh index a645b7f1..dde5d1f3 100755 --- a/continuous_integration/azure/install.sh +++ b/continuous_integration/azure/install.sh @@ -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 \ No newline at end of file +conda install -q -y -c conda-forge yarn + +pip install -q codecov diff --git a/continuous_integration/circle/install.sh b/continuous_integration/circle/install.sh index e670c23e..6b6e4e04 100755 --- a/continuous_integration/circle/install.sh +++ b/continuous_integration/circle/install.sh @@ -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" @@ -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 \ No newline at end of file +pip install -q codecov diff --git a/requirements/tests.txt b/requirements/tests.txt index 52641e71..7d3ff7fb 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -2,4 +2,4 @@ pytest pytest-cov flaky pytest-qt -pytest-timeout \ No newline at end of file +pytest-timeout