From 2be715c1576919121eb12b7bfe62b753e5aae50b Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Mon, 4 Feb 2019 12:28:19 -0800 Subject: [PATCH 1/8] FIX: Patch PyQt's configure.py to always assume a shared python. --- recipe/configure_python_library.patch | 38 +++++++++++++++++++++++++++ recipe/meta.yaml | 4 ++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 recipe/configure_python_library.patch diff --git a/recipe/configure_python_library.patch b/recipe/configure_python_library.patch new file mode 100644 index 0000000..bba46b2 --- /dev/null +++ b/recipe/configure_python_library.patch @@ -0,0 +1,38 @@ +diff --git a/configure.py b/configure.py +index ca753ee..1b0e685 100644 +--- a/configure.py ++++ b/configure.py +@@ -738,23 +738,18 @@ int main(int argc, char **argv) + + config_args = ducfg.get('CONFIG_ARGS', '') + +- dynamic_pylib = '--enable-shared' in config_args +- if not dynamic_pylib: +- dynamic_pylib = '--enable-framework' in config_args +- +- if dynamic_pylib: +- pyshlib = ducfg.get('LDLIBRARY', '') ++ pyshlib = ducfg.get('LDLIBRARY', '') + +- exec_prefix = ducfg['exec_prefix'] +- multiarch = ducfg.get('MULTIARCH', '') +- libdir = ducfg['LIBDIR'] ++ exec_prefix = ducfg['exec_prefix'] ++ multiarch = ducfg.get('MULTIARCH', '') ++ libdir = ducfg['LIBDIR'] + +- if glob.glob('%s/lib/libpython%d.%d*' % (exec_prefix, py_major, py_minor)): +- pylib_dir = exec_prefix + '/lib' +- elif multiarch != '' and glob.glob('%s/lib/%s/libpython%d.%d*' % (exec_prefix, multiarch, py_major, py_minor)): +- pylib_dir = exec_prefix + '/lib/' + multiarch +- elif glob.glob('%s/libpython%d.%d*' % (libdir, py_major, py_minor)): +- pylib_dir = libdir ++ if glob.glob('%s/lib/libpython%d.%d*' % (exec_prefix, py_major, py_minor)): ++ pylib_dir = exec_prefix + '/lib' ++ elif multiarch != '' and glob.glob('%s/lib/%s/libpython%d.%d*' % (exec_prefix, multiarch, py_major, py_minor)): ++ pylib_dir = exec_prefix + '/lib/' + multiarch ++ elif glob.glob('%s/libpython%d.%d*' % (libdir, py_major, py_minor)): ++ pylib_dir = libdir + + self.py_pylib_dir = pylib_dir + self.py_pylib_lib = pylib_lib diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9712989..8df9143 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,9 +11,11 @@ source: fn: PyQt5_gpl-5.6.tar.gz # [not win] url: http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.6/PyQt5_gpl-5.6.tar.gz # [not win] sha1: 8920e4094470ff93f79e257c37c46f5cd0bff7ab # [not win] + patches: + - configure_python_library.patch build: - number: 1008 + number: 1009 requirements: build: From 5a40473bd750af43890bf01c5bac5c1e66123c15 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Mon, 4 Feb 2019 22:32:25 +0000 Subject: [PATCH 2/8] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.12, and conda-forge-pinning 2019.01.29 --- .appveyor.yml | 8 +- .azure-pipelines/azure-pipelines-linux.yml | 39 +++++---- .azure-pipelines/azure-pipelines-osx.yml | 38 +++++---- .azure-pipelines/azure-pipelines-win.yml | 31 +++++-- .azure-pipelines/build_steps.sh | 10 +-- .azure-pipelines/run_docker_build.sh | 5 +- ...n_ccxx_compilertoolchain_cxxpython2.7.yaml | 29 ------- ...n_ccxx_compilertoolchain_cxxpython3.6.yaml | 29 ------- ...n_ccxx_compilertoolchain_cxxpython3.7.yaml | 29 ------- ...gxxpython2.7.yaml => linux_python2.7.yaml} | 13 +-- ...gxxpython3.6.yaml => linux_python3.6.yaml} | 13 +-- ...gxxpython3.7.yaml => linux_python3.7.yaml} | 13 +-- ...ilerclangcxx_compilerclangxxpython2.7.yaml | 32 -------- ...ilerclangcxx_compilerclangxxpython3.6.yaml | 32 -------- ...ilerclangcxx_compilerclangxxpython3.7.yaml | 32 -------- ...n_cxxpython2.7.yaml => osx_python2.7.yaml} | 12 +-- ...n_cxxpython3.6.yaml => osx_python3.6.yaml} | 12 +-- ...n_cxxpython3.7.yaml => osx_python3.7.yaml} | 12 +-- .circleci/build_steps.sh | 9 +- .circleci/config.yml | 82 ++++--------------- .circleci/fast_finish_ci_pr_build.sh | 2 +- .circleci/run_docker_build.sh | 5 +- .travis.yml | 18 ++-- README.md | 8 +- azure-pipelines.yml | 12 ++- 25 files changed, 137 insertions(+), 388 deletions(-) delete mode 100644 .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml delete mode 100644 .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml delete mode 100644 .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml rename .ci_support/{linux_c_compilergcccxx_compilergxxpython2.7.yaml => linux_python2.7.yaml} (52%) rename .ci_support/{linux_c_compilergcccxx_compilergxxpython3.6.yaml => linux_python3.6.yaml} (52%) rename .ci_support/{linux_c_compilergcccxx_compilergxxpython3.7.yaml => linux_python3.7.yaml} (52%) delete mode 100644 .ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml delete mode 100644 .ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml delete mode 100644 .ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml rename .ci_support/{osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml => osx_python2.7.yaml} (65%) rename .ci_support/{osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml => osx_python3.6.yaml} (65%) rename .ci_support/{osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml => osx_python3.7.yaml} (65%) diff --git a/.appveyor.yml b/.appveyor.yml index 6ae5bc4..9aef6ea 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,7 @@ # This file was automatically generated by conda-smithy. To update a component of this # file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run # "conda smithy rerender". +# -*- mode: yaml -*- environment: @@ -27,7 +28,7 @@ platform: 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/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" + 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%" del ff_ci_pr_build.py @@ -41,7 +42,8 @@ install: - cmd: set PYTHONUNBUFFERED=1 # Configure the VM. - - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 + # Tell conda we want an updated version of conda-forge-ci-setup and conda-build + - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build - cmd: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - cmd: run_conda_forge_build_setup @@ -49,6 +51,6 @@ install: build: off test_script: - - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + - conda.exe build recipe -m .ci_support\%CONFIG%.yaml deploy_script: - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7ec2dc0..1e22d9a 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -1,28 +1,39 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + jobs: -- job: linux_64 +- job: linux pool: vmImage: ubuntu-16.04 timeoutInMinutes: 240 strategy: maxParallel: 8 matrix: - linux_c_compilergcccxx_compilergxxpython2.7: - CONFIG: linux_c_compilergcccxx_compilergxxpython2.7 - linux_c_compilergcccxx_compilergxxpython3.6: - CONFIG: linux_c_compilergcccxx_compilergxxpython3.6 - linux_c_compilergcccxx_compilergxxpython3.7: - CONFIG: linux_c_compilergcccxx_compilergxxpython3.7 - linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7: - CONFIG: linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7 - linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6: - CONFIG: linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6 - linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7: - CONFIG: linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7 + linux_python2.7: + CONFIG: linux_python2.7 + UPLOAD_PACKAGES: False + linux_python3.6: + CONFIG: linux_python3.6 + UPLOAD_PACKAGES: False + linux_python3.7: + CONFIG: linux_python3.7 + UPLOAD_PACKAGES: False 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 + # embedded qemu-static + - script: | + docker run --rm --privileged multiarch/qemu-user-static:register + 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 \ No newline at end of file + displayName: Run docker build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 78ee36c..35efd7c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -1,23 +1,24 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + jobs: -- job: osx_64 +- job: osx pool: vmImage: macOS-10.13 timeoutInMinutes: 240 strategy: maxParallel: 8 matrix: - osx_c_compilerclangcxx_compilerclangxxpython2.7: - CONFIG: osx_c_compilerclangcxx_compilerclangxxpython2.7 - osx_c_compilerclangcxx_compilerclangxxpython3.6: - CONFIG: osx_c_compilerclangcxx_compilerclangxxpython3.6 - osx_c_compilerclangcxx_compilerclangxxpython3.7: - CONFIG: osx_c_compilerclangcxx_compilerclangxxpython3.7 - osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7: - CONFIG: osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7 - osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6: - CONFIG: osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6 - osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7: - CONFIG: osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7 + osx_python2.7: + CONFIG: osx_python2.7 + UPLOAD_PACKAGES: False + osx_python3.6: + CONFIG: osx_python3.6 + UPLOAD_PACKAGES: False + osx_python3.7: + CONFIG: osx_python3.7 + UPLOAD_PACKAGES: False steps: # TODO: Fast finish on azure pipelines? @@ -46,7 +47,7 @@ jobs: - 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 install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build displayName: 'Add conda-forge-ci-setup=2' - script: | @@ -81,4 +82,11 @@ jobs: conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml displayName: Build recipe - \ No newline at end of file + - script: | + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + set -x -e + upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + displayName: Upload recipe + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 2213574..cea3fa4 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -1,5 +1,9 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + jobs: -- job: win_64 +- job: win pool: vmImage: vs2017-win2016 timeoutInMinutes: 240 @@ -9,12 +13,15 @@ jobs: win_c_compilervs2008cxx_compilervs2008python2.7: CONFIG: win_c_compilervs2008cxx_compilervs2008python2.7 CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False win_c_compilervs2015cxx_compilervs2015python3.6: CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6 CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False win_c_compilervs2015cxx_compilervs2015python3.7: CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7 CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False steps: # TODO: Fast finish on azure pipelines? - script: | @@ -30,7 +37,6 @@ jobs: # - script: rmdir C:\cygwin /s /q # continueOnError: true - - powershell: | Set-PSDebug -Trace 1 @@ -71,21 +77,28 @@ jobs: # Configure the VM. - script: | run_conda_forge_build_setup + displayName: conda-forge build setup - run_conda_forge_build_setup + # 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')) - \ No newline at end of file + - script: | + upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) diff --git a/.azure-pipelines/build_steps.sh b/.azure-pipelines/build_steps.sh index 82832dc..779d52b 100755 --- a/.azure-pipelines/build_steps.sh +++ b/.azure-pipelines/build_steps.sh @@ -24,15 +24,15 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts. -conda clean --lock - -run_conda_forge_build_setup# make the build number clobber +run_conda_forge_build_setup +# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" - +if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +fi touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.azure-pipelines/run_docker_build.sh b/.azure-pipelines/run_docker_build.sh index 543db42..8ccadb8 100755 --- a/.azure-pipelines/run_docker_build.sh +++ b/.azure-pipelines/run_docker_build.sh @@ -33,7 +33,7 @@ if [ -z "$CONFIG" ]; then fi pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil ) +DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" @@ -41,13 +41,14 @@ rm -f "$DONE_CANARY" # Not all providers run with a real tty. Disable using one DOCKER_RUN_ARGS=" " - +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ -e CONFIG \ -e BINSTAR_TOKEN \ -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ $DOCKER_IMAGE \ bash \ /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh diff --git a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml deleted file mode 100644 index d86ad54..0000000 --- a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml +++ /dev/null @@ -1,29 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- toolchain_cxx -docker_image: -- condaforge/linux-anvil -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x - qt: - max_pin: x.x -python: -- '2.7' -qt: -- '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml deleted file mode 100644 index cd53d35..0000000 --- a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml +++ /dev/null @@ -1,29 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- toolchain_cxx -docker_image: -- condaforge/linux-anvil -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x - qt: - max_pin: x.x -python: -- '3.6' -qt: -- '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml deleted file mode 100644 index 0452cde..0000000 --- a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml +++ /dev/null @@ -1,29 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- toolchain_cxx -docker_image: -- condaforge/linux-anvil -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x - qt: - max_pin: x.x -python: -- '3.7' -qt: -- '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml b/.ci_support/linux_python2.7.yaml similarity index 52% rename from .ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml rename to .ci_support/linux_python2.7.yaml index d516a98..a30096a 100644 --- a/.ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -1,11 +1,9 @@ -build_number_decrement: -- '0' c_compiler: - gcc channel_sources: -- conda-forge/label/gcc7,defaults +- conda-forge,defaults channel_targets: -- conda-forge gcc7 +- conda-forge main cxx_compiler: - gxx docker_image: @@ -20,10 +18,3 @@ python: - '2.7' qt: - '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml b/.ci_support/linux_python3.6.yaml similarity index 52% rename from .ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml rename to .ci_support/linux_python3.6.yaml index 4479be3..11dc926 100644 --- a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,11 +1,9 @@ -build_number_decrement: -- '0' c_compiler: - gcc channel_sources: -- conda-forge/label/gcc7,defaults +- conda-forge,defaults channel_targets: -- conda-forge gcc7 +- conda-forge main cxx_compiler: - gxx docker_image: @@ -20,10 +18,3 @@ python: - '3.6' qt: - '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml b/.ci_support/linux_python3.7.yaml similarity index 52% rename from .ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml rename to .ci_support/linux_python3.7.yaml index 987eff3..b93e658 100644 --- a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,11 +1,9 @@ -build_number_decrement: -- '0' c_compiler: - gcc channel_sources: -- conda-forge/label/gcc7,defaults +- conda-forge,defaults channel_targets: -- conda-forge gcc7 +- conda-forge main cxx_compiler: - gxx docker_image: @@ -20,10 +18,3 @@ python: - '3.7' qt: - '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml deleted file mode 100644 index 27d58e7..0000000 --- a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml +++ /dev/null @@ -1,32 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x - qt: - max_pin: x.x -python: -- '2.7' -qt: -- '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml deleted file mode 100644 index b4dcf33..0000000 --- a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml +++ /dev/null @@ -1,32 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x - qt: - max_pin: x.x -python: -- '3.6' -qt: -- '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml deleted file mode 100644 index eaa6649..0000000 --- a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml +++ /dev/null @@ -1,32 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x - qt: - max_pin: x.x -python: -- '3.7' -qt: -- '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/.ci_support/osx_python2.7.yaml similarity index 65% rename from .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml rename to .ci_support/osx_python2.7.yaml index 6db5735..d4c14e8 100644 --- a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -24,9 +22,3 @@ python: - '2.7' qt: - '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml b/.ci_support/osx_python3.6.yaml similarity index 65% rename from .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml rename to .ci_support/osx_python3.6.yaml index d0b2675..be1fd34 100644 --- a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -24,9 +22,3 @@ python: - '3.6' qt: - '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml b/.ci_support/osx_python3.7.yaml similarity index 65% rename from .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml rename to .ci_support/osx_python3.7.yaml index 6afbd4f..eec1f65 100644 --- a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -1,15 +1,13 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -24,9 +22,3 @@ python: - '3.7' qt: - '5.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh index f908b1e..150cfde 100755 --- a/.circleci/build_steps.sh +++ b/.circleci/build_steps.sh @@ -24,9 +24,6 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts. -conda clean --lock - source run_conda_forge_build_setup @@ -43,8 +40,8 @@ make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" - -upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" - +if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +fi touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.circleci/config.yml b/.circleci/config.yml index 471da52..59da584 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,62 +1,15 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + version: 2 jobs: - build_linux_c_compilergcccxx_compilergxxpython2.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergcccxx_compilergxxpython2.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_compilergcccxx_compilergxxpython3.6: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergcccxx_compilergxxpython3.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 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_c_compilergcccxx_compilergxxpython3.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergcccxx_compilergxxpython3.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_ccxx_compilertoolchain_cxxpython2.7: + build_linux_python2.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7" + - CONFIG: "linux_python2.7" steps: - checkout - run: @@ -65,15 +18,15 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + 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_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6: + build_linux_python3.6: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6" + - CONFIG: "linux_python3.6" steps: - checkout - run: @@ -82,15 +35,15 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + 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_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7: + build_linux_python3.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7" + - CONFIG: "linux_python3.7" steps: - checkout - run: @@ -99,7 +52,7 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + 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 @@ -108,9 +61,6 @@ workflows: version: 2 build_and_test: jobs: - - build_linux_c_compilergcccxx_compilergxxpython2.7 - - build_linux_c_compilergcccxx_compilergxxpython3.6 - - build_linux_c_compilergcccxx_compilergxxpython3.7 - - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7 - - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6 - - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7 + - build_linux_python2.7 + - build_linux_python3.6 + - build_linux_python3.7 diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh index 8c048ac..4c0b560 100755 --- a/.circleci/fast_finish_ci_pr_build.sh +++ b/.circleci/fast_finish_ci_pr_build.sh @@ -1,4 +1,4 @@ #!/bin/bash -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ +curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.circleci/run_docker_build.sh b/.circleci/run_docker_build.sh index 2b3e413..8bb0bda 100755 --- a/.circleci/run_docker_build.sh +++ b/.circleci/run_docker_build.sh @@ -33,7 +33,7 @@ if [ -z "$CONFIG" ]; then fi pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil ) +DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" @@ -41,13 +41,14 @@ rm -f "$DONE_CANARY" # Enable running in interactive mode attached to a tty DOCKER_RUN_ARGS=" -it " - +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ -e CONFIG \ -e BINSTAR_TOKEN \ -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ $DOCKER_IMAGE \ bash \ /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh diff --git a/.travis.yml b/.travis.yml index e901915..4f1d921 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,18 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- language: generic os: osx -osx_image: xcode6.4 +osx_image: xcode9.4 env: matrix: - - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython2.7 - - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython3.6 - - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython3.7 - - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7 - - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6 - - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7 + - CONFIG=osx_python2.7 + - CONFIG=osx_python3.6 + - CONFIG=osx_python3.7 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. @@ -24,7 +22,7 @@ env: before_install: # Fast finish the PR. - | - (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ + (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 # Remove homebrew. @@ -53,7 +51,7 @@ install: echo "Configuring conda." source /Users/travis/miniconda3/bin/activate root - conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 + conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml source run_conda_forge_build_setup @@ -65,5 +63,5 @@ install: script: # generate the build number clobber - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml \ No newline at end of file diff --git a/README.md b/README.md index fe26ad3..a4a76ae 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ + + About pyqt ========== -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) - Home: http://www.riverbankcomputing.co.uk/software/pyqt Package license: Commercial, GPL-2.0, GPL-3.0 @@ -57,6 +59,8 @@ conda search pyqt --channel conda-forge About conda-forge ================= +[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) + conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the conda-forge GitHub organization. The conda-forge organization contains one repository diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 26fc203..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,10 +1,8 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - - - template: ./.azure-pipelines/azure-pipelines-win.yml - - \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From 6f3c615efd6a6f1c4dce267c12ab08b5f350b2e2 Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Tue, 5 Feb 2019 11:05:56 -0800 Subject: [PATCH 3/8] FIX: Adding mesa-libGL to yum_requirements.txt --- recipe/yum_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt index 5c820a2..a66b20f 100644 --- a/recipe/yum_requirements.txt +++ b/recipe/yum_requirements.txt @@ -1,2 +1,3 @@ xorg-x11-server-Xvfb gtk2-devel +mesa-libGL From 9c7df67b067a64f52c6e91e94b9cf3ed04b20b88 Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Tue, 5 Feb 2019 11:06:52 -0800 Subject: [PATCH 4/8] FIX: Revert to xcode6.4 as recommended by @ccordoba12. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f1d921..8cedd13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: generic os: osx -osx_image: xcode9.4 +osx_image: xcode6.4 env: @@ -64,4 +64,4 @@ script: # generate the build number clobber - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml \ No newline at end of file + - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml From 3d3a1691623d23be0f0fd0cb23f116b389d33eca Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Tue, 5 Feb 2019 20:02:49 +0000 Subject: [PATCH 5/8] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.12, and conda-forge-pinning 2019.01.29 --- .circleci/build_steps.sh | 2 +- .travis.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh index 150cfde..5688630 100755 --- a/.circleci/build_steps.sh +++ b/.circleci/build_steps.sh @@ -31,7 +31,7 @@ source run_conda_forge_build_setup # "recipe/yum_requirements.txt" file. After updating that file, # run "conda smithy rerender" and this line will be updated # automatically. -/usr/bin/sudo -n yum install -y xorg-x11-server-Xvfb gtk2-devel +/usr/bin/sudo -n yum install -y xorg-x11-server-Xvfb gtk2-devel mesa-libGL # make the build number clobber diff --git a/.travis.yml b/.travis.yml index 8cedd13..4f1d921 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: generic os: osx -osx_image: xcode6.4 +osx_image: xcode9.4 env: @@ -64,4 +64,4 @@ script: # generate the build number clobber - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml \ No newline at end of file From 80ea5a3b205cc6960c5a36c882e022e8542a7df0 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Wed, 6 Feb 2019 20:54:31 +0000 Subject: [PATCH 6/8] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.13, and conda-forge-pinning 2019.01.29 --- .appveyor.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 5 +++++ .azure-pipelines/build_steps.sh | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9aef6ea..ed979c3 100644 --- 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-win.yml b/.azure-pipelines/azure-pipelines-win.yml index cea3fa4..ebc185a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -81,6 +81,11 @@ jobs: 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 diff --git a/.azure-pipelines/build_steps.sh b/.azure-pipelines/build_steps.sh index 779d52b..41f19d5 100755 --- a/.azure-pipelines/build_steps.sh +++ b/.azure-pipelines/build_steps.sh @@ -25,6 +25,14 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" run_conda_forge_build_setup + +# Install the yum requirements defined canonically in the +# "recipe/yum_requirements.txt" file. After updating that file, +# run "conda smithy rerender" and this line will be updated +# automatically. +/usr/bin/sudo -n yum install -y xorg-x11-server-Xvfb gtk2-devel mesa-libGL + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" From 7616b743c8e33921c2bda4f1b39be751729b1fc0 Mon Sep 17 00:00:00 2001 From: Hugo Slepicka Date: Sun, 17 Feb 2019 10:39:39 -0800 Subject: [PATCH 7/8] Try to set xcode to 6.4 to test if travis pass. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4f1d921..8cedd13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: generic os: osx -osx_image: xcode9.4 +osx_image: xcode6.4 env: @@ -64,4 +64,4 @@ script: # generate the build number clobber - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml \ No newline at end of file + - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml From dcb18a808737cfd4d8180b81da35a066d0b5c403 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Mon, 11 Mar 2019 21:38:32 +0000 Subject: [PATCH 8/8] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and conda-forge-pinning 2019.03.11 --- .azure-pipelines/azure-pipelines-linux.yml | 2 +- .travis.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 1e22d9a..7ac96fd 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -28,7 +28,7 @@ jobs: # 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 diff --git a/.travis.yml b/.travis.yml index 8cedd13..4f1d921 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: generic os: osx -osx_image: xcode6.4 +osx_image: xcode9.4 env: @@ -64,4 +64,4 @@ script: # generate the build number clobber - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml \ No newline at end of file