From 744df366226ef47ddac80fc6715af7e37e160f19 Mon Sep 17 00:00:00 2001 From: Richard Lindsley Date: Mon, 18 Oct 2021 13:22:53 -0700 Subject: [PATCH 1/6] Ensure Python is installed --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 85684db..d83ff05 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -106,6 +106,9 @@ install: # - git submodule update --remote # versioneer does not work with submodules - git clone https://github.com/SHTOOLS/SHTOOLS.git + # Install new Python if necessary + - ps: .\multibuild\install_python.ps1 + # Prepend newly installed Python to the PATH of this build (this cannot be # done from inside the powershell script as it would require to restart # the parent CMD process). From b838b595a1e1cb61fe01570b85d39ac94271feb4 Mon Sep 17 00:00:00 2001 From: Richard Lindsley Date: Mon, 18 Oct 2021 13:24:20 -0700 Subject: [PATCH 2/6] Use the VS2015 image This ensures that mingw-w64 6.3.0 is available. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index d83ff05..dcda5f7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ platform: - x64 image: - - Visual Studio 2019 + - Visual Studio 2015 environment: global: From c6ba4826d61d8aa56125c6fe27b312890759e2fc Mon Sep 17 00:00:00 2001 From: Richard Lindsley Date: Mon, 18 Oct 2021 13:36:52 -0700 Subject: [PATCH 3/6] Clone multibuild into build --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index dcda5f7..7fac271 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -105,6 +105,7 @@ install: # Get needed submodules # - git submodule update --remote # versioneer does not work with submodules - git clone https://github.com/SHTOOLS/SHTOOLS.git + - git clone https://github.com/multi-build/multibuild.git # Install new Python if necessary - ps: .\multibuild\install_python.ps1 From 5a9374ea6c4150cd8b2791eb746660ac3461b376 Mon Sep 17 00:00:00 2001 From: Richard Lindsley Date: Mon, 18 Oct 2021 13:56:25 -0700 Subject: [PATCH 4/6] Mark the wheels as AppVeyor artifacts --- appveyor.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7fac271..03be201 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -197,4 +197,7 @@ build_script: on_success: - pip install twine - twine upload --username wieczor --password %PYPI_PASSWORD% --skip-existing dist/* - #- twine upload --repository-url https://test.pypi.org/legacy/ --username wieczor --password %PYPITEST_PASSWORD% --skip-existing dist/* \ No newline at end of file + #- twine upload --repository-url https://test.pypi.org/legacy/ --username wieczor --password %PYPITEST_PASSWORD% --skip-existing dist/* + +artifacts: + - path: dist\pyshtools-*.whl \ No newline at end of file From 2e9cd3b20d25d92abf7e2bde6ed4de8e5628ae71 Mon Sep 17 00:00:00 2001 From: Richard Lindsley Date: Mon, 18 Oct 2021 13:59:54 -0700 Subject: [PATCH 5/6] Try using absolute path to artifacts --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 03be201..cb5993d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -200,4 +200,4 @@ on_success: #- twine upload --repository-url https://test.pypi.org/legacy/ --username wieczor --password %PYPITEST_PASSWORD% --skip-existing dist/* artifacts: - - path: dist\pyshtools-*.whl \ No newline at end of file + - path: '%APPVEYOR_BUILD_FOLDER%\SHTOOLS\dist\pyshtools-*.whl' \ No newline at end of file From 0309592892f08cc774fb2e023fedfef8b1d479a8 Mon Sep 17 00:00:00 2001 From: Richard Lindsley Date: Mon, 18 Oct 2021 14:08:47 -0700 Subject: [PATCH 6/6] Make the artifact path relative again --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index cb5993d..ab5513d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -200,4 +200,4 @@ on_success: #- twine upload --repository-url https://test.pypi.org/legacy/ --username wieczor --password %PYPITEST_PASSWORD% --skip-existing dist/* artifacts: - - path: '%APPVEYOR_BUILD_FOLDER%\SHTOOLS\dist\pyshtools-*.whl' \ No newline at end of file + - path: SHTOOLS\dist\pyshtools-*.whl \ No newline at end of file