MAINT: master->main refs (#166)

* there are no plans I'm aware of to change `master` to
`main` on the wheels repo, but I've started seeing cron
errors related to `master` checkouts of the main repo

* so, try to fixup cases where `master` is incorrectly used
to reference the main SciPy repo, but leave `master` in for
those cases where we are referring to the wheels repo proper
(at least for now)

What has changed:

- `master` -> `main` in a bunch of places for SciPy and NumPy (distutils); latter shim may not even be needed anymore but things seem "ok" so..
- `appveyor.yml` gets a bigger set of changes:
  - it needed some newer C++ things, so the base image is bumped to a newer Visual Studio version (already done in the main repo quite some time ago, albeit on Azure instead)
  - bump build-time version of NumPy to `1.18.5` (not using `pyproject.toml` for Windows builds here yet); not going as high as `main` yet to facilitate the branching here
  - DLL/mingw toolchain adjustments for VS 2019
-  the `install_wheel` command has been adjusted to `install_wheel --prefer-binary` so that the 32-bit Linux Azure jobs don't hang/run for 40+ minutes trying to build NumPy `1.22.4` from source; other command suggestions failed for whatever reason, maybe because installing directly from a local wheel file is slightly different..
- bump `multibuild` submodule to latest upstream version; no real benefit to this--it was one of many attempts to deal with the 32-bit Linux wheel issues, but I'm not sure it is worth reverting either since we usually bump liberally there anyway


What is still failing in CI?

- 32-bit Linux wheels have 3 failures, 2 of which are handled by scipy/scipy#16390, the other is new as of today so I'm less worried about it for branching purposes
- that's it, everything else is passing, which is a huge change from where we were before this PR (and with the help of several recent PRs on `main` in main repo)

Author: tylerjereddy

.gitmodules

@@ -13,4 +13,4 @@
 [submodule "numpy-distutils"]
 	path = numpy-distutils
 	url = https://github.com/numpy/numpy.git
-	branch = master
+	branch = main

.travis.yml

@@ -7,7 +7,7 @@ env:
     global:
         - REPO_DIR=scipy
         # Also see DAILY_COMMIT below
-        - BUILD_COMMIT=master
+        - BUILD_COMMIT=main
         - PLAT=x86_64
         - CYTHON_BUILD_DEP="Cython==0.29.24"
         - PYTHRAN_BUILD_DEP="pythran"
@@ -20,7 +20,7 @@ env:
         - secure:
             "fne+dO/N+Zv8pusPVO6S58p7lFWLDIwjXwf/IgBPxGSdDFEQVY8xl0+nGPNNzYZfmX/inBrb/3+8el9sggC+X7KG6mGmCtcpwems2sWn6XY5OQ+kWl8SEdDs2SiAsrieqbC3d1cmMoHyddX/YdGWVSdIji70nRER0j9wjNwYNlE="
         # Commit when running from master branch
-        - DAILY_COMMIT=master
+        - DAILY_COMMIT=main
 
 language: python
 dist: bionic

appveyor.yml

@@ -5,18 +5,18 @@ clone_depth: 50
 # No reason for us to restrict the number concurrent jobs
 max_jobs: 100
 
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 cache:
   - '%LOCALAPPDATA%\pip\Cache'
 
 environment:
   global:
       MINGW_32: C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw32\bin
-      MINGW_64: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin
+      MINGW_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin
       CYTHON_BUILD_DEP: Cython==0.29.24
       PYTHRAN_BUILD_DEP: pythran
-      NUMPY_TEST_DEP: numpy==1.17.3
+      NUMPY_TEST_DEP: numpy==1.18.5
       PYBIND11_BUILD_DEP: pybind11==2.7.0
       TEST_MODE: fast
       APPVEYOR_SAVE_CACHE_ON_ERROR: true
@@ -25,8 +25,8 @@ environment:
       WHEELHOUSE_UPLOADER_SECRET:
         secure:
             jIyaD+VWmTlDGXThsKAkiLq8iljgYHiriq+kEUuW9tHj67R5BapLxLjbfco2nt8Y
-      BUILD_COMMIT: master
-      DAILY_COMMIT: master
+      BUILD_COMMIT: main
+      DAILY_COMMIT: main
 
   matrix:
     - PYTHON: C:\Python310-x64
@@ -53,15 +53,15 @@ environment:
     - PYTHON: C:\Python38
       PYTHON_VERSION: 3.8
       PYTHON_ARCH: 32
-      NUMPY_BUILD_DEP: numpy==1.17.3
-      NUMPY_TEST_DEP: numpy==1.17.3
+      NUMPY_BUILD_DEP: numpy==1.18.5
+      NUMPY_TEST_DEP: numpy==1.18.5
       CYTHON_BUILD_DEP: Cython
 
     - PYTHON: C:\Python38-x64
       PYTHON_VERSION: 3.8
       PYTHON_ARCH: 64
-      NUMPY_BUILD_DEP: numpy==1.17.3
-      NUMPY_TEST_DEP: numpy==1.17.3
+      NUMPY_BUILD_DEP: numpy==1.18.5
+      NUMPY_TEST_DEP: numpy==1.18.5
       CYTHON_BUILD_DEP: Cython
 
 init:
@@ -121,7 +121,7 @@ install:
       ls $destination
 
   # Upgrade to the latest pip, setuptools, and wheel.
-  - python -m pip install -U pip setuptools wheel
+  - python -m pip install -U pip "setuptools==59.5.0" wheel
 
   # Install build requirements.
   - python -m pip install "%CYTHON_BUILD_DEP%" "%PYTHRAN_BUILD_DEP%" "%NUMPY_BUILD_DEP%" "%PYBIND11_BUILD_DEP%"
@@ -149,14 +149,14 @@ build_script:
   - type ..\LICENSE_win32.txt >> LICENSE.txt
   # Copy over additional DLLs to bundle to the wheels.
   # The find command below is just to print where the libraries are, for debugging.
-  - C:\cygwin\bin\find "C:\Program Files (x86)\Microsoft Visual Studio 14.0" -type f -name 'msvcp*.dll'
+  - C:\cygwin\bin\find "C:\Program Files (x86)\Microsoft Visual Studio" -type f -name 'msvcp*.dll'
   # * Python >=3.5
   # Copy over MSVC C++ runtime library, which Python.org does no bundle, but is required by us.
   # The version should match the compiler version, see https://wiki.python.org/moin/WindowsCompilers
   - mkdir "build\lib.win32-%PYTHON_VERSION%\scipy\.libs"
   - mkdir "build\lib.win-amd64-%PYTHON_VERSION%\scipy\.libs"
-  - copy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x86\Microsoft.VC140.CRT\msvcp140.dll" "build\lib.win32-%PYTHON_VERSION%\scipy\.libs\"
-  - copy "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\x64\Microsoft.VC140.CRT\msvcp140.dll" "build\lib.win-amd64-%PYTHON_VERSION%\scipy\.libs\"
+  - copy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.29.30133\x86\Microsoft.VC142.CRT\msvcp140.dll" "build\lib.win32-%PYTHON_VERSION%\scipy\.libs\"
+  - copy "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Redist\MSVC\14.29.30133\x64\Microsoft.VC142.CRT\msvcp140.dll" "build\lib.win-amd64-%PYTHON_VERSION%\scipy\.libs\"
   # Build wheel using setup.py
   - ps: |
       $PYTHON_ARCH = $env:PYTHON_ARCH

azure-pipelines.yml

@@ -11,7 +11,7 @@ pr:
 - master
 
 variables:
-  BUILD_COMMIT: "master"
+  BUILD_COMMIT: "main"
 
 jobs:
   - template: azure-posix.yml

azure-posix.yml

@@ -11,8 +11,8 @@ jobs:
     variables:
       REPO_DIR: "scipy"
       PLAT: "x86_64"
-      NIGHTLY_BUILD_COMMIT: "master"
-      DAILY_COMMIT: "master"
+      NIGHTLY_BUILD_COMMIT: "main"
+      DAILY_COMMIT: "main"
     strategy:
       matrix:
         ${{ insert }}: ${{ parameters.matrix }}
@@ -109,7 +109,7 @@ jobs:
 
       - bash: |
           set -e
-          if [ "$BUILD_COMMIT" == "master" ]; then
+          if [ "$BUILD_COMMIT" == "main" ]; then
             ANACONDA_ORG="scipy-wheels-nightly"
             TOKEN="$MAPPED_SCIPY_WHEELS_NIGHTLY"
             echo getting SCIPY_WHEELS_NIGHTLY

config.sh

@@ -71,7 +71,7 @@ function install_run {
     $PYTHON_EXE -m pip install $(pip_opts) setuptools_scm
 
     # Copypaste from multibuild/common_utils.sh:install_run
-    install_wheel
+    install_wheel --prefer-binary
     mkdir tmp_for_test
     (cd tmp_for_test && run_tests)
 }