Skip to content

Commit 699a06b

Browse files
authored
Merge pull request #179 from xylar/fix_docs
Fix an issue with the docs and with Azure building the docs
2 parents a4756e4 + e6e3f15 commit 699a06b

File tree

3 files changed

+24
-25
lines changed

3 files changed

+24
-25
lines changed

azure-pipelines.yml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,42 +17,39 @@ jobs:
1717
displayName: Add conda to PATH
1818

1919
- bash: |
20+
set -e
21+
eval "$(conda shell.bash hook)"
2022
conda config --add channels conda-forge
2123
conda config --set channel_priority strict
22-
conda create --yes --quiet --name build python=$PYTHON_VERSION conda conda-build
23-
displayName: Create Anaconda build environment
24+
conda install --yes python=$PYTHON_VERSION conda conda-build mamba boa
25+
displayName: Update conda base environment
2426
2527
- bash: |
2628
eval "$(conda shell.bash hook)"
27-
conda activate build
28-
conda build -m "ci/python${PYTHON_VERSION}.yaml" "recipe"
29+
# workaround based on recent failures
30+
rm /usr/share/miniconda/pkgs/cache/*.json
31+
conda mambabuild -m "ci/python${PYTHON_VERSION}.yaml" "recipe"
2932
displayName: Build geometric_features
3033
3134
- bash: |
35+
set -e
3236
eval "$(conda shell.bash hook)"
33-
conda activate build
34-
conda create --yes --quiet --name test -c ${CONDA_PREFIX}/conda-bld/ \
35-
python=$PYTHON_VERSION geometric_features pytest
37+
mamba create --yes --quiet --name test -c ${CONDA_PREFIX}/conda-bld/ \
38+
python=$PYTHON_VERSION geometric_features pytest sphinx mock \
39+
sphinx_rtd_theme m2r2
3640
displayName: Create Anaconda test environment
3741
3842
- bash: |
43+
set -e
3944
eval "$(conda shell.bash hook)"
4045
conda activate test
4146
pytest --pyargs geometric_features
4247
displayName: pytest
4348
4449
- bash: |
50+
set -e
4551
eval "$(conda shell.bash hook)"
46-
conda activate build
47-
conda create --yes --quiet --name docs -c ${CONDA_PREFIX}/conda-bld/ \
48-
python=$PYTHON_VERSION geometric_features sphinx mock \
49-
sphinx_rtd_theme m2r
50-
condition: eq(variables['python.version'], '3.8')
51-
displayName: Create Anaconda docs environment
52-
53-
- bash: |
54-
eval "$(conda shell.bash hook)"
55-
conda activate docs
52+
conda activate test
5653
5754
echo "source branch: $(Build.SourceBranch)"
5855
echo "target branch: $(System.PullRequest.TargetBranch)"
@@ -134,25 +131,27 @@ jobs:
134131
displayName: Fix permissions
135132

136133
- bash: |
134+
set -e
135+
eval "$(conda shell.bash hook)"
137136
conda config --add channels conda-forge
138137
conda config --set channel_priority strict
139-
conda create --yes --quiet --name build python=$PYTHON_VERSION conda conda-build
140-
displayName: Create Anaconda build environment
138+
conda install --yes python=$PYTHON_VERSION conda conda-build mamba boa
139+
displayName: Update conda base environment
141140
142141
- bash: |
143142
eval "$(conda shell.bash hook)"
144-
conda activate build
145-
conda build -m "ci/python${PYTHON_VERSION}.yaml" "recipe"
143+
conda mambabuild -m "ci/python${PYTHON_VERSION}.yaml" "recipe"
146144
displayName: Build geometric_features
147145
148146
- bash: |
147+
set -e
149148
eval "$(conda shell.bash hook)"
150-
conda activate build
151-
conda create --yes --quiet --name test -c ${CONDA_PREFIX}/conda-bld/ \
149+
mamba create --yes --quiet --name test -c ${CONDA_PREFIX}/conda-bld/ \
152150
python=$PYTHON_VERSION geometric_features pytest
153151
displayName: Create Anaconda test environment
154152
155153
- bash: |
154+
set -e
156155
eval "$(conda shell.bash hook)"
157156
conda activate test
158157
pytest --pyargs geometric_features

dev-spec.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ pip
1616
# Documentation
1717
sphinx
1818
sphinx_rtd_theme
19-
m2r
19+
m2r2

geometric_features/docs/parse_quick_start.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
in the documentation
55
"""
66

7-
from m2r import convert
7+
from m2r2 import convert
88

99

1010
def build_quick_start():

0 commit comments

Comments
 (0)