Merge branch 'main' into tensor-mesh-cell-bounds

Author: jcapriot

.ci/azure/deploy.yml

@@ -3,10 +3,17 @@ jobs:
   displayName: "Deploy Docs and source"
   pool:
     vmImage: ubuntu-latest
+
   steps:
     # No need to checkout the repo here!
     - checkout: none
 
+    - bash: |
+        echo $IS_TAG
+        echo $IS_MAIN
+        echo $BRANCH_NAME
+      displayName: Report branch parameters
+
     # Just download all of the items already built
     - task: DownloadPipelineArtifact@2
       inputs:
@@ -29,6 +36,7 @@ jobs:
     - bash: |
         ls -l dist
         ls -l html
+      displayName: Report downloaded cache contents.
 
     - bash: |
         git config --global user.name ${GH_NAME}
@@ -42,22 +50,39 @@ jobs:
     - bash: |
         twine upload --skip-existing dist/*
       displayName: Deploy source and wheels
+      condition: eq(variables.IS_TAG, true)
       env:
         TWINE_USERNAME: $(twine.username)
         TWINE_PASSWORD: $(twine.password)
 
     # upload documentation to discretize-docs gh-pages on tags
     - bash: |
-        git clone --depth 1 https://${GH_TOKEN}@github.com/simpeg/discretize-docs.git
+        git clone -q --branch gh-pages --depth 1 https://${GH_TOKEN}@github.com/simpeg/discretize-docs.git
+      displayName: Checkout doc repository
+      env:
+        GH_TOKEN: $(gh.token)
+
+    - bash: |
         cd discretize-docs
-        git gc --prune=now
-        git remote prune origin
-        rm -rf en/main/*
-        cp -r html/* en/main/
+        rm -rf "en/$BRANCH_NAME"
+        mv ../html "en/$BRANCH_NAME"
         touch .nojekyll
-        git add .
+      displayName: Set Doc Folder
+
+    - bash: |
+        # Update latest symlink
+        cd discretize-docs
+        rm -f en/latest
+        ln -s "en/$BRANCH_NAME" en/latest
+      displayName: Point Latest to tag
+      condition: eq(variables.IS_TAG, true)
+
+    - bash: |
+        # Commit and push
+        cd discretize-docs
+        git add --all
         git commit -am "Azure CI commit ref $(Build.SourceVersion)"
         git push
       displayName: Push documentation to discretize-docs
       env:
-        GH_TOKEN: $(gh.token)
+        GH_TOKEN: $(gh.token)

.ci/azure/docs.yml

@@ -1,5 +1,5 @@
 jobs:
-- job:
+- job: BuildDocs
   displayName: "Build Documentation"
   pool:
     vmImage: ubuntu-latest
@@ -33,4 +33,4 @@ jobs:
       inputs:
         targetPath: 'docs/_build/html'
         artifact: 'html_docs'
-        parallel: true
+        parallel: true

.ci/azure/setup_env.sh

@@ -7,7 +7,6 @@ do_doc=$(echo "${DOC_BUILD:-false}" | tr '[:upper:]' '[:lower:]')
 
 if ${is_azure}
 then
-  conda update --yes -n base conda
   if ${do_doc}
   then
     .ci/setup_headless_display.sh

.ci/azure/setup_miniconda_macos.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -ex #echo on and exit if any line fails
+
+echo "arch is $ARCH"
+if [[ $ARCH == "X64" ]]; then
+  MINICONDA_ARCH_LABEL="x86_64"
+else
+  MINICONDA_ARCH_LABEL="arm64"
+fi
+echo $MINICONDA_ARCH_LABEL
+mkdir -p ~/miniconda3
+curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-$MINICONDA_ARCH_LABEL.sh -o ~/miniconda3/miniconda.sh
+bash ~/miniconda3/miniconda.sh -b -u -p ~/miniconda3
+rm ~/miniconda3/miniconda.sh
+echo "##vso[task.setvariable variable=CONDA;]${HOME}/miniconda3"

.ci/azure/test.yml

@@ -35,15 +35,16 @@ jobs:
     vmImage: $(image)
   variables:
     varOS: $(Agent.OS)
+    ARCH: $(Agent.OSArchitecture)
   steps:
+    - bash: .ci/azure/setup_miniconda_macos.sh
+      displayName: Install miniconda on mac
+      condition: eq(variables.varOS, 'Darwin')
+
     - bash: echo "##vso[task.prependpath]$CONDA/bin"
       displayName: Add conda to PATH
       condition: ne(variables.varOS, 'Windows_NT')
 
-    - bash: sudo chown -R $USER $CONDA
-      displayName: Take ownership of conda directory
-      condition: eq(variables.varOS, 'Darwin')
-
     - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"
       displayName: Add conda to PATH
       condition: eq(variables.varOS, 'Windows_NT')

.ci/environment_test.yml

@@ -4,21 +4,23 @@ channels:
 dependencies:
   - numpy>=1.22.4
   - scipy>=1.8
+
   # optionals
   - vtk>=6
   - pyvista
   - omf
   - matplotlib
+
   # documentation
   - sphinx
-  - pydata-sphinx-theme==0.13.3
+  - pydata-sphinx-theme==0.15.4
   - sphinx-gallery>=0.1.13
   - numpydoc>=1.5
   - jupyter
   - graphviz
-  - pymatsolver>=0.1.2
   - pillow
   - pooch
+
   # testing
   - sympy
   - pytest

azure-pipelines.yml

@@ -15,6 +15,11 @@ pr:
     exclude:
     - '*no-ci*'
 
+variables:
+  BRANCH_NAME: $(Build.SourceBranchName)
+  IS_TAG: $[startsWith(variables['Build.SourceBranch'], 'refs/tags/')]
+  IS_MAIN: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
+
 stages:
   - stage: StyleChecks
     displayName: "Style Checks"
@@ -52,7 +57,7 @@ stages:
     dependsOn:
       - BuildWheels
       - BuildSource
-    condition: and(succeeded(), startsWith(variables['build.sourceBranch'], 'refs/tags/'))
+    condition: and(succeeded(), or(eq(variables.IS_TAG, true), eq(variables.IS_MAIN, true)))
     jobs:
       - template: .ci/azure/deploy.yml