From b15875fff2dee875798668ec56d7ef606d951ece Mon Sep 17 00:00:00 2001 From: Joseph Capriotti Date: Fri, 27 Oct 2023 11:42:42 -0600 Subject: [PATCH] re-do the uploads --- azure-pipelines.yml | 281 ++++++++++++++++++++++---------------------- 1 file changed, 138 insertions(+), 143 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 648d399ce..13def7528 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -46,40 +46,141 @@ stages: - script: flake8 displayName: "Run flake8" -- stage: WheelBuilds - displayName: "Wheel Building" +- stage: Testing jobs: -# - job: linux -# pool: { vmImage: 'Ubuntu-20.04' } -# steps: -# - task: UsePythonVersion@0 -# - bash: | -# set -o errexit -# python3 -m pip install --upgrade pip -# pip3 install cibuildwheel==2.16.2 -# displayName: Install dependencies -# - bash: cibuildwheel --output-dir wheelhouse . -# displayName: Build wheels -# - task: PublishBuildArtifacts@1 -# inputs: { pathtoPublish: 'wheelhouse' } -# -# - job: macos -# pool: { vmImage: 'macOS-11' } -# variables: -# CIBW_ARCHS_MACOS: "x86_64 arm64" -# steps: -# - task: UsePythonVersion@0 -# - bash: | -# set -o errexit -# python3 -m pip install --upgrade pip -# python3 -m pip install cibuildwheel==2.16.2 -# displayName: Install dependencies -# - bash: cibuildwheel --output-dir wheelhouse . -# displayName: Build wheels -# - task: PublishBuildArtifacts@1 -# inputs: { pathtoPublish: wheelhouse } + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml + +- stage: Deploy + displayName: "Deploy Source Wheels and Docs" + condition: and(succeeded(), startsWith(variables['build.sourceBranch'], 'refs/tags/')) + jobs: + - job: + displayName: Deploy Docs and source + pool: + vmImage: ubuntu-latest + variables: + DISPLAY: ':99.0' + PYVISTA_OFF_SCREEN: 'True' + python.version: '3.10' + timeoutInMinutes: 180 + steps: + - bash: | + git config --global user.name ${GH_NAME} + git config --global user.email ${GH_EMAIL} + git config --list | grep user. + displayName: 'Configure git' + env: + GH_NAME: $(gh.name) + GH_EMAIL: $(gh.email) + + - bash: | + wget -O Mambaforge.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh" + bash Mambaforge.sh -b -p "${HOME}/conda" + displayName: Install mamba + + - bash: | + source "${HOME}/conda/etc/profile.d/conda.sh" + source "${HOME}/conda/etc/profile.d/mamba.sh" + cp environment_test.yml environment_test_with_pyversion.yml + echo " - python="$(python.version) >> environment_test_with_pyversion.yml + mamba env create -f environment_test_with_pyversion.yml + conda activate discretize-test + pip install pytest-azurepipelines + displayName: Create Anaconda testing environment + + - bash: | + source "${HOME}/conda/etc/profile.d/conda.sh" + conda activate discretize-test + pip install --no-build-isolation --editable . + displayName: Build package + + - bash: | + source "${HOME}/conda/etc/profile.d/conda.sh" + conda activate discretize-test + python -m build --no-isolation --skip-dependency-check --sdist . + ls -la dist + twine upload --skip-existing dist/* + displayName: Deploy source + env: + TWINE_USERNAME: $(twine.username) + TWINE_PASSWORD: $(twine.password) + + - bash: | + source "${HOME}/conda/etc/profile.d/conda.sh" + conda activate discretize-test + .ci/setup_headless_display.sh + cd docs + make html + cd .. + displayName: Building documentation + # upload documentation to discretize-docs gh-pages on tags + - bash: | + git clone --depth 1 https://${GH_TOKEN}@github.com/simpeg/discretize-docs.git + cd discretize-docs + git gc --prune=now + git remote prune origin + rm -rf en/main/* + cp -r $BUILD_SOURCESDIRECTORY/docs/_build/html/* en/main/ + touch .nojekyll + git add . + git commit -am "Azure CI commit ref $(Build.SourceVersion)" + git push + displayName: Push documentation to discretize-docs + env: + GH_TOKEN: $(gh.token) + + - job: linux + displayName: Build Linux wheels + pool: { vmImage: 'Ubuntu-20.04' } + steps: + - task: UsePythonVersion@0 + - bash: + git fetch --tags + displayName: Fetch tags + - bash: | + set -o errexit + python3 -m pip install --upgrade pip + pip3 install cibuildwheel==2.16.2 + displayName: Install dependencies + - bash: cibuildwheel --output-dir wheelhouse . + displayName: Build wheels + - script: twine upload --skip-existing wheelhouse/* + displayName: Upload to PYPI + env: + TWINE_USERNAME: $(twine.username) + TWINE_PASSWORD: $(twine.password) + - task: PublishBuildArtifacts@1 + inputs: { pathtoPublish: 'wheelhouse' } + + - job: macos + displayName: Build Mac wheels + pool: { vmImage: 'macOS-11' } + variables: + CIBW_ARCHS_MACOS: "x86_64 arm64" + steps: + - task: UsePythonVersion@0 + - bash: + git fetch --tags + displayName: Fetch tags + - bash: | + set -o errexit + python3 -m pip install --upgrade pip + python3 -m pip install cibuildwheel==2.16.2 + displayName: Install dependencies + - bash: cibuildwheel --output-dir wheelhouse . + displayName: Build wheels + - script: twine upload --skip-existing wheelhouse/* + displayName: Upload to PYPI + env: + TWINE_USERNAME: $(twine.username) + TWINE_PASSWORD: $(twine.password) + - task: PublishBuildArtifacts@1 + inputs: { pathtoPublish: wheelhouse } - job: windows + displayName: Build Windows wheels pool: { vmImage: 'windows-2019' } variables: CIBW_ARCHS_WINDOWS: "AMD64" @@ -87,6 +188,7 @@ stages: - task: UsePythonVersion@0 - bash: git fetch --tags + displayName: Fetch tags - bash: | set -o errexit python -m pip install --upgrade pip @@ -94,117 +196,10 @@ stages: displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels + - script: twine upload --skip-existing wheelhouse/* + displayName: Upload to PYPI + env: + TWINE_USERNAME: $(twine.username) + TWINE_PASSWORD: $(twine.password) - task: PublishBuildArtifacts@1 inputs: { pathtoPublish: 'wheelhouse' } - -#- stage: Testing -# jobs: -# - template: ./.azure-pipelines/azure-pipelines-linux.yml -# - template: ./.azure-pipelines/azure-pipelines-osx.yml -# - template: ./.azure-pipelines/azure-pipelines-win.yml -# -#- stage: Deploy -# condition: and(succeeded(), startsWith(variables['build.sourceBranch'], 'refs/tags/')) -# jobs: -# - job: -# displayName: Deploy Docs and source -# pool: -# vmImage: ubuntu-latest -# variables: -# DISPLAY: ':99.0' -# PYVISTA_OFF_SCREEN: 'True' -# python.version: '3.10' -# timeoutInMinutes: 180 -# steps: -# - bash: | -# git config --global user.name ${GH_NAME} -# git config --global user.email ${GH_EMAIL} -# git config --list | grep user. -# displayName: 'Configure git' -# env: -# GH_NAME: $(gh.name) -# GH_EMAIL: $(gh.email) -# -# - bash: | -# wget -O Mambaforge.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-$(uname)-$(uname -m).sh" -# bash Mambaforge.sh -b -p "${HOME}/conda" -# displayName: Install mamba -# -# - bash: | -# source "${HOME}/conda/etc/profile.d/conda.sh" -# source "${HOME}/conda/etc/profile.d/mamba.sh" -# cp environment_test.yml environment_test_with_pyversion.yml -# echo " - python="$(python.version) >> environment_test_with_pyversion.yml -# mamba env create -f environment_test_with_pyversion.yml -# conda activate discretize-test -# pip install pytest-azurepipelines -# displayName: Create Anaconda testing environment -# -# - bash: | -# source "${HOME}/conda/etc/profile.d/conda.sh" -# conda activate discretize-test -# pip install --no-build-isolation --editable . -# displayName: Build package -# -# - bash: | -# source "${HOME}/conda/etc/profile.d/conda.sh" -# conda activate discretize-test -# python -m build --no-isolation --skip-dependency-check --sdist . -# ls -la dist -# twine upload --skip-existing dist/* -# displayName: Deploy source -# env: -# TWINE_USERNAME: $(twine.username) -# TWINE_PASSWORD: $(twine.password) -# -# - bash: | -# source "${HOME}/conda/etc/profile.d/conda.sh" -# conda activate discretize-test -# .ci/setup_headless_display.sh -# cd docs -# make html -# cd .. -# displayName: Building documentation -# # upload documentation to discretize-docs gh-pages on tags -# - bash: | -# git clone --depth 1 https://${GH_TOKEN}@github.com/simpeg/discretize-docs.git -# cd discretize-docs -# git gc --prune=now -# git remote prune origin -# rm -rf en/main/* -# cp -r $BUILD_SOURCESDIRECTORY/docs/_build/html/* en/main/ -# touch .nojekyll -# git add . -# git commit -am "Azure CI commit ref $(Build.SourceVersion)" -# git push -# displayName: Push documentation to discretize-docs -# env: -# GH_TOKEN: $(gh.token) -# -# - job: -# displayName: Windows Wheels -# strategy: -# matrix: -# win-Python38: -# python.version: '3.8' -# win-Python39: -# python.version: '3.9' -# win-Python310: -# python.version: '3.10' -# win-Python311: -# python.version: '3.11' -# pool: -# vmImage: windows-latest -# steps: -# - task: UsePythonVersion@0 -# inputs: -# versionSpec: '$(python.version)' -# - script: pip install build twine -# displayName: Install build dependencies -# - script: python -m build --wheel . -# displayName: Build Wheel -# - script: twine upload --skip-existing dist/* -# displayName: Upload to PYPI -# env: -# TWINE_USERNAME: $(twine.username) -# TWINE_PASSWORD: $(twine.password)