From 227994f36ae7a2edbd5035ef62588b543e9a9bc8 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Sat, 29 Dec 2018 12:25:21 -0500 Subject: [PATCH] MNT: Re-rendered with conda-smithy 3.2.2 and pinning 2018.12.28 --- .appveyor.yml | 3 -- .azure-pipelines/azure-pipelines-linux.yml | 4 -- .azure-pipelines/azure-pipelines-osx.yml | 4 -- .azure-pipelines/azure-pipelines-win.yml | 3 -- .ci_support/linux_c_compilergccpython2.7.yaml | 34 ----------------- .../linux_c_compilertoolchain_cpython2.7.yaml | 34 ----------------- .ci_support/osx_c_compilerclangpython2.7.yaml | 37 ------------------- .../osx_c_compilertoolchain_cpython2.7.yaml | 37 ------------------- .../win_c_compilervs2008python2.7.yaml | 27 -------------- .circleci/config.yml | 36 ------------------ .travis.yml | 2 - 11 files changed, 221 deletions(-) delete mode 100644 .ci_support/linux_c_compilergccpython2.7.yaml delete mode 100644 .ci_support/linux_c_compilertoolchain_cpython2.7.yaml delete mode 100644 .ci_support/osx_c_compilerclangpython2.7.yaml delete mode 100644 .ci_support/osx_c_compilertoolchain_cpython2.7.yaml delete mode 100644 .ci_support/win_c_compilervs2008python2.7.yaml diff --git a/.appveyor.yml b/.appveyor.yml index 66b3912..1faa928 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,9 +9,6 @@ environment: secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 matrix: - - CONFIG: win_c_compilervs2008python2.7 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - CONFIG: win_c_compilervs2015python3.6 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 3e1b85f..a38bb12 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -6,14 +6,10 @@ jobs: strategy: maxParallel: 8 matrix: - linux_c_compilergccpython2.7: - CONFIG: linux_c_compilergccpython2.7 linux_c_compilergccpython3.6: CONFIG: linux_c_compilergccpython3.6 linux_c_compilergccpython3.7: CONFIG: linux_c_compilergccpython3.7 - linux_c_compilertoolchain_cpython2.7: - CONFIG: linux_c_compilertoolchain_cpython2.7 linux_c_compilertoolchain_cpython3.6: CONFIG: linux_c_compilertoolchain_cpython3.6 linux_c_compilertoolchain_cpython3.7: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index daf41c4..a735dd5 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -6,14 +6,10 @@ jobs: strategy: maxParallel: 8 matrix: - osx_c_compilerclangpython2.7: - CONFIG: osx_c_compilerclangpython2.7 osx_c_compilerclangpython3.6: CONFIG: osx_c_compilerclangpython3.6 osx_c_compilerclangpython3.7: CONFIG: osx_c_compilerclangpython3.7 - osx_c_compilertoolchain_cpython2.7: - CONFIG: osx_c_compilertoolchain_cpython2.7 osx_c_compilertoolchain_cpython3.6: CONFIG: osx_c_compilertoolchain_cpython3.6 osx_c_compilertoolchain_cpython3.7: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 10a2888..27f0c1e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -6,9 +6,6 @@ jobs: strategy: maxParallel: 4 matrix: - win_c_compilervs2008python2.7: - CONFIG: win_c_compilervs2008python2.7 - CONDA_BLD_PATH: D:\\bld\\ win_c_compilervs2015python3.6: CONFIG: win_c_compilervs2015python3.6 CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_c_compilergccpython2.7.yaml b/.ci_support/linux_c_compilergccpython2.7.yaml deleted file mode 100644 index db7f6df..0000000 --- a/.ci_support/linux_c_compilergccpython2.7.yaml +++ /dev/null @@ -1,34 +0,0 @@ -build_number_decrement: -- '0' -c_compiler: -- gcc -cairo: -- '1.14' -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -docker_image: -- condaforge/linux-anvil-comp7 -glib: -- '2.58' -libffi: -- '3.2' -pin_run_as_build: - cairo: - max_pin: x.x - glib: - max_pin: x.x - libffi: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilertoolchain_cpython2.7.yaml b/.ci_support/linux_c_compilertoolchain_cpython2.7.yaml deleted file mode 100644 index 4d3696d..0000000 --- a/.ci_support/linux_c_compilertoolchain_cpython2.7.yaml +++ /dev/null @@ -1,34 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -cairo: -- '1.14' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil -glib: -- '2.58' -libffi: -- '3.2' -pin_run_as_build: - cairo: - max_pin: x.x - glib: - max_pin: x.x - libffi: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangpython2.7.yaml b/.ci_support/osx_c_compilerclangpython2.7.yaml deleted file mode 100644 index bdbfe01..0000000 --- a/.ci_support/osx_c_compilerclangpython2.7.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -cairo: -- '1.14' -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -glib: -- '2.58' -libffi: -- '3.2' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - cairo: - max_pin: x.x - glib: - max_pin: x.x - libffi: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_cpython2.7.yaml b/.ci_support/osx_c_compilertoolchain_cpython2.7.yaml deleted file mode 100644 index b1fd8f4..0000000 --- a/.ci_support/osx_c_compilertoolchain_cpython2.7.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -cairo: -- '1.14' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -glib: -- '2.58' -libffi: -- '3.2' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - cairo: - max_pin: x.x - glib: - max_pin: x.x - libffi: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - c_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/win_c_compilervs2008python2.7.yaml b/.ci_support/win_c_compilervs2008python2.7.yaml deleted file mode 100644 index e505cb5..0000000 --- a/.ci_support/win_c_compilervs2008python2.7.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- vs2008 -cairo: -- '1.14' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -glib: -- '2.58' -libffi: -- '3.2' -pin_run_as_build: - cairo: - max_pin: x.x - glib: - max_pin: x.x - libffi: - max_pin: x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - python - - c_compiler diff --git a/.circleci/config.yml b/.circleci/config.yml index abeba37..f568cb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,23 +1,6 @@ version: 2 jobs: - build_linux_c_compilergccpython2.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergccpython2.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 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh build_linux_c_compilergccpython3.6: working_directory: ~/test machine: true @@ -52,23 +35,6 @@ jobs: - run: # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. command: ./.circleci/run_docker_build.sh - build_linux_c_compilertoolchain_cpython2.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilertoolchain_cpython2.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 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh build_linux_c_compilertoolchain_cpython3.6: working_directory: ~/test machine: true @@ -108,9 +74,7 @@ workflows: version: 2 build_and_test: jobs: - - build_linux_c_compilergccpython2.7 - build_linux_c_compilergccpython3.6 - build_linux_c_compilergccpython3.7 - - build_linux_c_compilertoolchain_cpython2.7 - build_linux_c_compilertoolchain_cpython3.6 - build_linux_c_compilertoolchain_cpython3.7 diff --git a/.travis.yml b/.travis.yml index 982c2c3..11f2370 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,8 @@ osx_image: xcode9.4 env: matrix: - - CONFIG=osx_c_compilerclangpython2.7 - CONFIG=osx_c_compilerclangpython3.6 - CONFIG=osx_c_compilerclangpython3.7 - - CONFIG=osx_c_compilertoolchain_cpython2.7 - CONFIG=osx_c_compilertoolchain_cpython3.6 - CONFIG=osx_c_compilertoolchain_cpython3.7