Merge bb5793f into 2e0af2f

Author: gingi

.vsts/darwin/darwin-dependencies.yml

@@ -1,11 +1,7 @@
 steps:
   - template: ../dependencies.yml
-  - template: ../pyenv.yml
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
-      python --version
-      pip install -r python/requirements.txt
       echo "Node.js version $(node --version)"
       echo "NPM version $(npm --version)"
       npm ci

.vsts/dependencies.yml

@@ -2,6 +2,5 @@ steps:
   - powershell: ./scripts/azpipelines/build-type.ps1 "$(Build.SourceBranch)" "$(Build.BuildNumber)"
     displayName: Resolve build type
 
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '16.x.x'
+  - template: ./node-setup.yml
+  - template: ./python-setup.yml

.vsts/linux/linux-dependencies.yml

@@ -8,12 +8,8 @@ steps:
       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0 rpm
     displayName: Install Linux packages
   - template: ../dependencies.yml
-  - template: ../pyenv.yml
   - script: |
       set -e
-      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
-      echo "Python version $(python --version)"
-      pip install -r python/requirements.txt
       echo "Node.js version $(node --version)"
       echo "NPM version $(npm --version)"
       npm install -g codecov

.vsts/node-setup.yml

@@ -0,0 +1,13 @@
+steps:
+  - task: NodeTool@0
+    inputs:
+      versionSpec: '16.x.x'
+
+  - script: |
+      cp .vsts/pipelines.npmrc .npmrc
+    displayName: Stage .npmrc configuration
+
+  - task: npmAuthenticate@0
+    displayName: Authenticate with NPM private feed
+    inputs:
+      workingFile: .npmrc

.vsts/pipelines.npmrc

@@ -0,0 +1,3 @@
+registry=https://azurebatch.pkgs.visualstudio.com/_packaging/BatchExplorer/npm/registry/
+
+always-auth=true

.vsts/pyenv.yml

@@ -0,0 +1,29 @@
+steps:
+  - task: UsePythonVersion@0
+    condition: eq( variables['Agent.OS'], 'Windows_NT' )
+    inputs:
+      versionSpec: '3.8.x'
+    displayName: Install Python 3.8 for Batch Explorer
+
+  - bash: ./scripts/azpipelines/setup-python.sh
+    displayName: Set up Python environment and private feed
+
+  - task: PipAuthenticate@1
+    displayName: 'Pip Authenticate'
+    inputs:
+      artifactFeeds: 'BatchExplorer'
+
+  - script: |
+      set -e
+      . "$(Agent.WorkFolder)/.venv/batchexplorer/bin/activate"
+      pip install -r python/requirements.txt
+    condition: ne( variables['Agent.OS'], 'Windows_NT' )
+    displayName: Install Python dependencies
+
+  - powershell: |
+      . .vsts/win/exec.ps1
+      $ErrorActionPreference = "Stop"
+      $(Agent.WorkFolder)\.venv\batchexplorer\Scripts\Activate.ps1
+      exec { pip install -r python/requirements.txt }
+    condition: eq( variables['Agent.OS'], 'Windows_NT' )
+    displayName: Install Python dependencies

.vsts/python-setup.yml

@@ -6,9 +6,7 @@ pool:
   demands:
   - ImageOverride -equals BatchExplorerBuildImage-Linux
 steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: '16.x.x'
+  - template: ./node-setup.yml
 
   - script: npm ci
     displayName: Install dependencies

.vsts/update-en-loc.yml

@@ -1,19 +1,11 @@
 steps:
   - template: ../dependencies.yml
 
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.8.x'
-    displayName: Install python 3.8 for BatchExplorer
-
   # KLUDGE: Use `npm i` instead of `npm ci` due to this issue:
   #         https://github.com/npm/cli/issues/558#issuecomment-580392554
   - powershell: |
       . .vsts/win/exec.ps1
       $ErrorActionPreference = "Stop"
-      exec { python -m pip install --upgrade pip }
-      exec { python --version }
-      exec { pip install -r python/requirements.txt }
       exec { Write-Host "Node.js version" $(node --version) }
       exec { Write-Host "NPM version" $(npm --version) }
       exec { npm install --loglevel=error }

.vsts/win/win-dependencies.yml

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e
+
+pyroot="$AGENT_WORKFOLDER/.venv/batchexplorer"
+
+if [ "$AGENT_OS" == "Windows_NT" ]; then
+    # Python is already installed via a pipeline task
+    conf_file="$pyroot/pip.ini"
+else
+    conf_file="$pyroot/pip.conf"
+    python_version=3.8.5
+
+    echo "Installing pyenv..."
+    export PYENV_ROOT="$AGENT_WORKFOLDER/.pyenv"
+    archive="$PYENV_ROOT/pyenv.tar.gz"
+    mkdir -p "$PYENV_ROOT"
+    curl -s -S -L "https://github.com/pyenv/pyenv/archive/v1.2.20.tar.gz" > "$archive"
+    echo "5ecd10d3ec502ce9b7d8109fbe8cb2e4a8af8b73ce5c216b8e268452724a65f3  $archive" | shasum -c
+    tar xzf "$archive" -C "$PYENV_ROOT" --strip-components=1
+    export PATH="$PYENV_ROOT/bin:$PATH"
+    pyenv --version
+
+    echo "Installing Python $python_version..."
+    env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $python_version
+    pyenv global 3.8.5
+    eval "$(pyenv init -)"
+    echo "##vso[task.prependpath]$PYENV_ROOT/bin"
+    echo "##vso[task.prependpath]$PYENV_ROOT/shims"
+fi
+
+echo "Setting up Python virtual environment..."
+python -m venv "$pyroot"
+if [ "$AGENT_OS" == "Windows_NT" ]; then
+    "$pyroot/Scripts/activate"
+else
+    source "$pyroot/bin/activate"
+fi
+echo "Path is $PATH"
+
+echo "Upgrading pip..."
+python -m pip install --upgrade pip
+pip install keyring artifacts-keyring
+
+echo "Configuring private feed..."
+# If the target conf file doesn't exist, pip config creates one at the user dir.
+# This doesn't matter all that much for build agents.
+touch "$conf_file"
+pip config set global.index-url https://azurebatch.pkgs.visualstudio.com/_packaging/BatchExplorer/pypi/simple/
+pip config list