diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 303a160..55affaa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,18 +30,21 @@ jobs: displayName: Add conda to PATH - bash: | + set -e conda config --add channels conda-forge conda config --set channel_priority strict conda create --yes --quiet --name build python=$PYTHON_VERSION conda conda-build displayName: Create Anaconda build environment - bash: | + set -e eval "$(conda shell.bash hook)" conda activate build conda build -m "ci/python${PYTHON_VERSION}.yaml" "recipe" displayName: Build pyremap - bash: | + set -e eval "$(conda shell.bash hook)" conda activate build conda create --yes --quiet --name test -c ${CONDA_PREFIX}/conda-bld/ \ @@ -49,20 +52,23 @@ jobs: displayName: Create Anaconda test environment - bash: | + set -e eval "$(conda shell.bash hook)" conda activate test pytest --pyargs pyremap displayName: pytest - bash: | + set -e eval "$(conda shell.bash hook)" conda activate build conda create --yes --quiet --name docs -c ${CONDA_PREFIX}/conda-bld/ \ - python=$PYTHON_VERSION pyremap sphinx mock sphinx_rtd_theme m2r + python=$PYTHON_VERSION pyremap sphinx mock sphinx_rtd_theme m2r2 condition: eq(variables['python.version'], '3.8') displayName: Create Anaconda docs environment - bash: | + set -e eval "$(conda shell.bash hook)" conda activate docs @@ -146,25 +152,29 @@ jobs: displayName: Fix permissions - bash: | + set -e conda config --add channels conda-forge conda config --set channel_priority strict conda create --yes --quiet --name build python=$PYTHON_VERSION conda conda-build displayName: Create Anaconda build environment - bash: | + set -e eval "$(conda shell.bash hook)" conda activate build conda build -m "ci/python${PYTHON_VERSION}.yaml" "recipe" displayName: Build pyremap - bash: | + set -e eval "$(conda shell.bash hook)" conda activate build conda create --yes --quiet --name test -c ${CONDA_PREFIX}/conda-bld/ \ - python=$PYTHON_VERSION pyremap pytest sphinx mock sphinx_rtd_theme m2r + python=$PYTHON_VERSION pyremap pytest sphinx mock sphinx_rtd_theme m2r2 displayName: Create Anaconda test environment - bash: | + set -e eval "$(conda shell.bash hook)" conda activate test pytest --pyargs pyremap diff --git a/dev-spec.txt b/dev-spec.txt index ad4112e..394161c 100644 --- a/dev-spec.txt +++ b/dev-spec.txt @@ -21,4 +21,4 @@ mock pillow sphinx sphinx_rtd_theme -m2r +m2r2 diff --git a/docs/versions.rst b/docs/versions.rst index c3694e5..44ec402 100644 --- a/docs/versions.rst +++ b/docs/versions.rst @@ -14,6 +14,7 @@ Documentation On GitHub `v0.0.12`_ `0.0.12`_ `v0.0.13`_ `0.0.13`_ `v0.0.14`_ `0.0.14`_ +`v0.0.15`_ `0.0.15`_ ================ =============== .. _`stable`: ../stable/index.html @@ -26,6 +27,7 @@ Documentation On GitHub .. _`v0.0.12`: ../0.0.12/index.html .. _`v0.0.13`: ../0.0.13/index.html .. _`v0.0.14`: ../0.0.14/index.html +.. _`v0.0.15`: ../0.0.15/index.html .. _`master`: https://github.com/MPAS-Dev/pyremap/tree/master .. _`0.0.6`: https://github.com/MPAS-Dev/pyremap/tree/0.0.6 .. _`0.0.7`: https://github.com/MPAS-Dev/pyremap/tree/0.0.7 @@ -36,3 +38,4 @@ Documentation On GitHub .. _`0.0.12`: https://github.com/MPAS-Dev/pyremap/tree/0.0.12 .. _`0.0.13`: https://github.com/MPAS-Dev/pyremap/tree/0.0.13 .. _`0.0.14`: https://github.com/MPAS-Dev/pyremap/tree/0.0.14 +.. _`0.0.15`: https://github.com/MPAS-Dev/pyremap/tree/0.0.15 diff --git a/pyremap/__init__.py b/pyremap/__init__.py index b7c9306..6652af0 100644 --- a/pyremap/__init__.py +++ b/pyremap/__init__.py @@ -6,5 +6,5 @@ from pyremap.polar import get_polar_descriptor_from_file, get_polar_descriptor -__version_info__ = (0, 0, 14) +__version_info__ = (0, 0, 15) __version__ = '.'.join(str(vi) for vi in __version_info__) diff --git a/pyremap/docs/parse_quick_start.py b/pyremap/docs/parse_quick_start.py index 9cb875c..03e6cd1 100644 --- a/pyremap/docs/parse_quick_start.py +++ b/pyremap/docs/parse_quick_start.py @@ -1,4 +1,4 @@ -from m2r import convert +from m2r2 import convert def build_quick_start(): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9123487..588d184 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pyremap" %} -{% set version = "0.0.14" %} +{% set version = "0.0.15" %} package: name: {{ name|lower }}