Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Appveyor debug work 1.9.0rc1 #1

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
[submodule "numpy-distutils"]
path = numpy-distutils
url = https://github.com/numpy/numpy.git
branch = master
branch = main
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
11 changes: 6 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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
Expand All @@ -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
Expand Down Expand Up @@ -80,6 +80,7 @@ init:
install:
- cmd: echo "Filesystem root:"
- dir C:\
- dir "C:\mingw-w64\"

- echo "List Program Files:"
- dir "C:\Program Files (x86)\"
Expand Down Expand Up @@ -121,7 +122,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%"
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pr:
- master

variables:
BUILD_COMMIT: "master"
BUILD_COMMIT: "main"

jobs:
- template: azure-posix.yml
Expand Down
6 changes: 3 additions & 3 deletions azure-posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down