MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.3.2, and con…

…da-forge-pinning 2019.03.17
regro-cf-autotick-bot · Mar 23, 2019 · 55deb2b · 55deb2b
1 parent 66f77b1
commit 55deb2b
Show file tree

Hide file tree

Showing 19 changed files with 159 additions and 297 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -29,7 +29,7 @@ install:
     # If there is a newer build queued for the same PR, cancel this one.
     - cmd: |
         powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
-        ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
+        "%CONDA_INSTALL_LOCN%\python.exe" ff_ci_pr_build.py -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
         del ff_ci_pr_build.py
 
     # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.)

diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
@@ -3,35 +3,37 @@
 # -*- mode: yaml -*-
 
 jobs:
-- job: linux_64
+- job: linux
   pool:
     vmImage: ubuntu-16.04
-  timeoutInMinutes: 240
+  timeoutInMinutes: 360
   strategy:
     maxParallel: 8
     matrix:
       linux_python2.7:
         CONFIG: linux_python2.7
-        UPLOAD_PACKAGES: False
+        UPLOAD_PACKAGES: True
       linux_python3.6:
         CONFIG: linux_python3.6
-        UPLOAD_PACKAGES: False
+        UPLOAD_PACKAGES: True
       linux_python3.7:
         CONFIG: linux_python3.7
-        UPLOAD_PACKAGES: False
+        UPLOAD_PACKAGES: True
   steps:
   - script: |
       sudo pip install --upgrade pip
       sudo pip install setuptools shyaml
     displayName: Install dependencies
 
-  # configure qemu binfmt-misc running.  This allows us to run docker containers 
+  # configure qemu binfmt-misc running.  This allows us to run docker containers
   # embedded qemu-static
   - script: |
-      docker run --rm --privileged multiarch/qemu-user-static:register
+      docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
       ls /proc/sys/fs/binfmt_misc/
     condition: not(startsWith(variables['CONFIG'], 'linux_64'))
     displayName: Configure binfmt_misc
 
   - script: .azure-pipelines/run_docker_build.sh
-    displayName: Run docker build
+    displayName: Run docker build
+    env:
+      BINSTAR_TOKEN: $(BINSTAR_TOKEN)
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
@@ -3,22 +3,22 @@
 # -*- mode: yaml -*-
 
 jobs:
-- job: osx_64
+- job: osx
   pool:
     vmImage: macOS-10.13
-  timeoutInMinutes: 240
+  timeoutInMinutes: 360
   strategy:
     maxParallel: 8
     matrix:
       osx_python2.7:
         CONFIG: osx_python2.7
-        UPLOAD_PACKAGES: False
+        UPLOAD_PACKAGES: True
       osx_python3.6:
         CONFIG: osx_python3.6
-        UPLOAD_PACKAGES: False
+        UPLOAD_PACKAGES: True
       osx_python3.7:
         CONFIG: osx_python3.7
-        UPLOAD_PACKAGES: False
+        UPLOAD_PACKAGES: True
 
   steps:
   # TODO: Fast finish on azure pipelines?
@@ -34,25 +34,18 @@ jobs:
       rm ~/uninstall_homebrew
     displayName: Remove homebrew
 
-  - script: |
-      echo "Installing Miniconda"
-      set -x -e
-      curl -o $(Build.StagingDirectory)/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
-      chmod +x $(Build.StagingDirectory)/miniconda.sh
-      $(Build.StagingDirectory)/miniconda.sh -b -p $(Build.StagingDirectory)/miniconda
-      export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
-      echo "Setting up Conda environment"
-    displayName: 'Install miniconda'
+  - bash: |
+      echo "##vso[task.prependpath]$CONDA/bin"
+      sudo chown -R $USER $CONDA
+    displayName: Add conda to PATH
 
   - script: |
-      export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
-      set -x -e
-      conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
+      source activate base
+      conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build shyaml
     displayName: 'Add conda-forge-ci-setup=2'
 
   - script: |
-      set -x -e
-      export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
+      source activate base
       echo "Configuring conda."
 
       setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml
@@ -65,26 +58,24 @@ jobs:
     displayName: Configure conda and conda-build
 
   - script: |
-      export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
-      set -x -e
+      source activate base
       mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml
     displayName: Mangle compiler
 
   - script: |
-      export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
-      set -x -e
+      source activate base
       make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml
     displayName: Generate build number clobber file
 
   - script: |
-      export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
-      set -x -e
+      source activate base
       conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml
     displayName: Build recipe
 
   - script: |
-      export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
-      set -x -e
+      source activate base
       upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml
     displayName: Upload recipe
+    env:
+      BINSTAR_TOKEN: $(BINSTAR_TOKEN)
     condition: not(eq(variables['UPLOAD_PACKAGES'], 'False'))
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
@@ -3,10 +3,10 @@
 # -*- mode: yaml -*-
 
 jobs:
-- job: win_64
+- job: win
   pool:
     vmImage: vs2017-win2016
-  timeoutInMinutes: 240
+  timeoutInMinutes: 360
   strategy:
     maxParallel: 4
     matrix:
@@ -73,28 +73,37 @@ jobs:
 
     # Configure the VM
     - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml
-    
+
     # Configure the VM.
     - script: |
         run_conda_forge_build_setup
 
       displayName: conda-forge build setup
     
 
+    - script: |
+        rmdir C:\strawberry /s /q
+      continueOnError: true
+      displayName: remove strawberryperl
+
     # Special cased version setting some more things!
     - script: |
-        conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
+        conda.exe build recipe -m .ci_support\%CONFIG%.yaml
       displayName: Build recipe (vs2008)
-      env: {
-        VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin",
-      }
+      env:
+        VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin"
+        PYTHONUNBUFFERED: 1
       condition: contains(variables['CONFIG'], 'vs2008')
 
     - script: |
-        conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
+        conda.exe build recipe -m .ci_support\%CONFIG%.yaml
       displayName: Build recipe
+      env:
+        PYTHONUNBUFFERED: 1
       condition: not(contains(variables['CONFIG'], 'vs2008'))
 
     - script: |
         upload_package .\ .\recipe .ci_support\%CONFIG%.yaml
+      env:
+        BINSTAR_TOKEN: $(BINSTAR_TOKEN)
       condition: not(eq(variables['UPLOAD_PACKAGES'], 'False'))
diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml
@@ -1,5 +1,7 @@
 c_compiler:
 - gcc
+c_compiler_version:
+- '7'
 channel_sources:
 - conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml
@@ -1,5 +1,7 @@
 c_compiler:
 - gcc
+c_compiler_version:
+- '7'
 channel_sources:
 - conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml
@@ -1,5 +1,7 @@
 c_compiler:
 - gcc
+c_compiler_version:
+- '7'
 channel_sources:
 - conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml
@@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 c_compiler:
 - clang
+c_compiler_version:
+- '4'
 channel_sources:
 - conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml
@@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 c_compiler:
 - clang
+c_compiler_version:
+- '4'
 channel_sources:
 - conda-forge,defaults
 channel_targets:

diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml
@@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 c_compiler:
 - clang
+c_compiler_version:
+- '4'
 channel_sources:
 - conda-forge,defaults
 channel_targets:

diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh
diff --git a/.circleci/checkout_merge_commit.sh b/.circleci/checkout_merge_commit.sh
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,62 +5,20 @@
 version: 2
 
 jobs:
-  build_linux_python2.7:
+  build:
     working_directory: ~/test
     machine: true
-    environment:
-      - CONFIG: "linux_python2.7"
     steps:
-      - checkout
       - run:
-          name: Fast finish outdated PRs and merge PRs
-          command: |
-            ./.circleci/fast_finish_ci_pr_build.sh
-            ./.circleci/checkout_merge_commit.sh
-      - run:
-          command: docker pull condaforge/linux-anvil-comp7
-      - run:
-          # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
-          command: ./.circleci/run_docker_build.sh
-  build_linux_python3.6:
-    working_directory: ~/test
-    machine: true
-    environment:
-      - CONFIG: "linux_python3.6"
-    steps:
-      - checkout
-      - run:
-          name: Fast finish outdated PRs and merge PRs
-          command: |
-            ./.circleci/fast_finish_ci_pr_build.sh
-            ./.circleci/checkout_merge_commit.sh
-      - run:
-          command: docker pull condaforge/linux-anvil-comp7
-      - run:
-          # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
-          command: ./.circleci/run_docker_build.sh
-  build_linux_python3.7:
-    working_directory: ~/test
-    machine: true
-    environment:
-      - CONFIG: "linux_python3.7"
-    steps:
-      - checkout
-      - run:
-          name: Fast finish outdated PRs and merge PRs
-          command: |
-            ./.circleci/fast_finish_ci_pr_build.sh
-            ./.circleci/checkout_merge_commit.sh
-      - run:
-          command: docker pull condaforge/linux-anvil-comp7
-      - run:
-          # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
-          command: ./.circleci/run_docker_build.sh
+          # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
+          command: exit 0
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - build_linux_python2.7
-      - build_linux_python3.6
-      - build_linux_python3.7
+      - build:
+          filters:
+            branches:
+              ignore:
+                - /.*/