Skip to content

Commit e5ff6e4

Browse files
committed
separated windows and *nix templates
1 parent 246e583 commit e5ff6e4

File tree

8 files changed

+33
-42
lines changed

8 files changed

+33
-42
lines changed

.azure-pipelines/azure-pipelines.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ jobs:
1717
# We need to take ownership if we want to update conda or install packages globally
1818
- bash: sudo chown -R $USER $CONDA
1919
displayName: Take ownership of conda installation
20-
21-
- template: templates/setup-script.yml
20+
- template: templates/setup-script-nix.yml
2221
- template: templates/nb-docs.yml
2322

2423
- job: linux
@@ -35,7 +34,7 @@ jobs:
3534
- bash: echo "##vso[task.prependpath]$CONDA/bin"
3635
displayName: Add conda to PATH
3736

38-
- template: templates/setup-script.yml
37+
- template: templates/setup-script-nix.yml
3938
- template: templates/nb-docs.yml
4039

4140
- job: windows
@@ -52,5 +51,5 @@ jobs:
5251
- powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
5352
displayName: Add conda to PATH
5453

55-
- template: templates/setup-script.yml
56-
- template: templates/nb-docs.yml
54+
- template: templates/setup-script-win.yml
55+
- template: templates/nb-docs-win.yml

.azure-pipelines/macos.yml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,27 @@ trigger:
44
variables:
55
miniconda.url: https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
66

7-
strategy:
8-
matrix:
9-
py37:
10-
python.version: "3.7"
11-
py36:
12-
python.version: "3.6"
13-
147
pool:
158
vmImage: macOS-10.14
169

1710
steps:
1811
# Add conda to PATH.
12+
1913
- bash: echo "##vso[task.prependpath]$CONDA/bin"
2014
displayName: Add conda to PATH
2115

22-
- script: |
23-
# Install Python, py.test, and required packages.
24-
conda env create -f environment.yml
25-
source activate bayesian-modelling-tutorial
26-
conda install -y python=$(python.version)
27-
python -m ipykernel install --user --name bayesian-modelling-tutorial
28-
displayName: 'Create environment, install correct Python, and activate kernel.'
16+
# - script: |
17+
# # Install Python, py.test, and required packages.
18+
# conda env create -f environment.yml
19+
# source activate bayesian-modelling-tutorial
20+
# conda install -y python=$(python.version)
21+
# python -m ipykernel install --user --name bayesian-modelling-tutorial
22+
# displayName: 'Create environment, install correct Python, and activate kernel.'
2923

30-
# Q: Does second script not recognize environment context from 1st script?
31-
- script: |
32-
source activate bayesian-modelling-tutorial
33-
mkdir -p docs/notebooks
34-
jupyter nbconvert --config nbconvert_config.py --execute --template full
35-
pandoc README.md -o docs/index.html -c static/pandoc.css -s
36-
displayName: 'Build docs pages'
24+
# # Q: Does second script not recognize environment context from 1st script?
25+
# - script: |
26+
# source activate bayesian-modelling-tutorial
27+
# mkdir -p docs/notebooks
28+
# jupyter nbconvert --config nbconvert_config.py --execute --template full
29+
# pandoc README.md -o docs/index.html -c static/pandoc.css -s
30+
# displayName: 'Build docs pages'

.azure-pipelines/templates/conda-mac.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- script: |
3+
activate bayesian-modelling-tutorial
4+
mkdir -p docs/notebooks
5+
jupyter nbconvert --config nbconvert_config.py --execute --template full
6+
pandoc README.md -o docs/index.html -c static/pandoc.css -s
7+
displayName: 'Build docs pages'

.azure-pipelines/templates/python-matrix.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
steps:
2+
- script: |
3+
conda env create -f environment.yml
4+
activate bayesian-modelling-tutorial
5+
conda install -y python=$(python.version)
6+
python -m ipykernel install --user --name bayesian-modelling-tutorial
7+
displayName: 'Create environment, install correct Python, and activate kernel.'

0 commit comments

Comments
 (0)