diff --git a/.appveyor.yml b/.appveyor.yml index 4e17413..876cdb0 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: @@ -24,8 +25,8 @@ 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')" - ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" + 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')" + "%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.) @@ -38,7 +39,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 @@ -46,6 +48,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 593e931..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_cxx_compilergxxpython2.7: - CONFIG: linux_cxx_compilergxxpython2.7 - linux_cxx_compilergxxpython3.6: - CONFIG: linux_cxx_compilergxxpython3.6 - linux_cxx_compilergxxpython3.7: - CONFIG: linux_cxx_compilergxxpython3.7 - linux_cxx_compilertoolchain_cxxpython2.7: - CONFIG: linux_cxx_compilertoolchain_cxxpython2.7 - linux_cxx_compilertoolchain_cxxpython3.6: - CONFIG: linux_cxx_compilertoolchain_cxxpython3.6 - linux_cxx_compilertoolchain_cxxpython3.7: - CONFIG: linux_cxx_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 57db3f6..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_cxx_compilerclangxxpython2.7: - CONFIG: osx_cxx_compilerclangxxpython2.7 - osx_cxx_compilerclangxxpython3.6: - CONFIG: osx_cxx_compilerclangxxpython3.6 - osx_cxx_compilerclangxxpython3.7: - CONFIG: osx_cxx_compilerclangxxpython3.7 - osx_cxx_compilertoolchain_cxxpython2.7: - CONFIG: osx_cxx_compilertoolchain_cxxpython2.7 - osx_cxx_compilertoolchain_cxxpython3.6: - CONFIG: osx_cxx_compilertoolchain_cxxpython3.6 - osx_cxx_compilertoolchain_cxxpython3.7: - CONFIG: osx_cxx_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 4286dad..4490daf 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,9 +13,11 @@ jobs: win_cxx_compilervs2015python3.6: CONFIG: win_cxx_compilervs2015python3.6 CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False win_cxx_compilervs2015python3.7: CONFIG: win_cxx_compilervs2015python3.7 CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False steps: # TODO: Fast finish on azure pipelines? - script: | @@ -27,7 +33,6 @@ jobs: # - script: rmdir C:\cygwin /s /q # continueOnError: true - - powershell: | Set-PSDebug -Trace 1 @@ -68,21 +73,33 @@ jobs: # Configure the VM. - script: | run_conda_forge_build_setup + displayName: conda-forge build setup - run_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')) - \ 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_cxx_compilergxxpython2.7.yaml b/.ci_support/linux_cxx_compilergxxpython2.7.yaml deleted file mode 100644 index 083743a..0000000 --- a/.ci_support/linux_cxx_compilergxxpython2.7.yaml +++ /dev/null @@ -1,36 +0,0 @@ -boost: -- 1.68.0 -build_number_decrement: -- '0' -cairo: -- '1.16' -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- gxx -docker_image: -- condaforge/linux-anvil-comp7 -freetype: -- 2.9.1 -numpy: -- '1.9' -pin_run_as_build: - boost: - max_pin: x.x.x - cairo: - max_pin: x.x - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_cxx_compilergxxpython3.6.yaml b/.ci_support/linux_cxx_compilergxxpython3.6.yaml deleted file mode 100644 index a9c612f..0000000 --- a/.ci_support/linux_cxx_compilergxxpython3.6.yaml +++ /dev/null @@ -1,36 +0,0 @@ -boost: -- 1.68.0 -build_number_decrement: -- '0' -cairo: -- '1.16' -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- gxx -docker_image: -- condaforge/linux-anvil-comp7 -freetype: -- 2.9.1 -numpy: -- '1.9' -pin_run_as_build: - boost: - max_pin: x.x.x - cairo: - max_pin: x.x - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_cxx_compilergxxpython3.7.yaml b/.ci_support/linux_cxx_compilergxxpython3.7.yaml deleted file mode 100644 index 6dfad5e..0000000 --- a/.ci_support/linux_cxx_compilergxxpython3.7.yaml +++ /dev/null @@ -1,36 +0,0 @@ -boost: -- 1.68.0 -build_number_decrement: -- '0' -cairo: -- '1.16' -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- gxx -docker_image: -- condaforge/linux-anvil-comp7 -freetype: -- 2.9.1 -numpy: -- '1.9' -pin_run_as_build: - boost: - max_pin: x.x.x - cairo: - max_pin: x.x - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_cxx_compilertoolchain_cxxpython2.7.yaml b/.ci_support/linux_python2.7.yaml similarity index 63% rename from .ci_support/linux_cxx_compilertoolchain_cxxpython2.7.yaml rename to .ci_support/linux_python2.7.yaml index 803291f..e12f281 100644 --- a/.ci_support/linux_cxx_compilertoolchain_cxxpython2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -1,7 +1,5 @@ boost: - 1.68.0 -build_number_decrement: -- '1000' cairo: - '1.16' channel_sources: @@ -9,9 +7,9 @@ channel_sources: channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- gxx docker_image: -- condaforge/linux-anvil +- condaforge/linux-anvil-comp7 freetype: - 2.9.1 numpy: @@ -28,9 +26,3 @@ pin_run_as_build: max_pin: x.x python: - '2.7' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_cxx_compilertoolchain_cxxpython3.6.yaml b/.ci_support/linux_python3.6.yaml similarity index 63% rename from .ci_support/linux_cxx_compilertoolchain_cxxpython3.6.yaml rename to .ci_support/linux_python3.6.yaml index 5fcedb1..866868b 100644 --- a/.ci_support/linux_cxx_compilertoolchain_cxxpython3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,7 +1,5 @@ boost: - 1.68.0 -build_number_decrement: -- '1000' cairo: - '1.16' channel_sources: @@ -9,9 +7,9 @@ channel_sources: channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- gxx docker_image: -- condaforge/linux-anvil +- condaforge/linux-anvil-comp7 freetype: - 2.9.1 numpy: @@ -28,9 +26,3 @@ pin_run_as_build: max_pin: x.x python: - '3.6' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_cxx_compilertoolchain_cxxpython3.7.yaml b/.ci_support/linux_python3.7.yaml similarity index 63% rename from .ci_support/linux_cxx_compilertoolchain_cxxpython3.7.yaml rename to .ci_support/linux_python3.7.yaml index 55c230e..0e804c5 100644 --- a/.ci_support/linux_cxx_compilertoolchain_cxxpython3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,7 +1,5 @@ boost: - 1.68.0 -build_number_decrement: -- '1000' cairo: - '1.16' channel_sources: @@ -9,9 +7,9 @@ channel_sources: channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- gxx docker_image: -- condaforge/linux-anvil +- condaforge/linux-anvil-comp7 freetype: - 2.9.1 numpy: @@ -28,9 +26,3 @@ pin_run_as_build: max_pin: x.x python: - '3.7' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/osx_cxx_compilerclangxxpython2.7.yaml b/.ci_support/osx_cxx_compilerclangxxpython2.7.yaml deleted file mode 100644 index 978e29d..0000000 --- a/.ci_support/osx_cxx_compilerclangxxpython2.7.yaml +++ /dev/null @@ -1,39 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.68.0 -build_number_decrement: -- '0' -cairo: -- '1.16' -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -freetype: -- 2.9.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.9' -pin_run_as_build: - boost: - max_pin: x.x.x - cairo: - max_pin: x.x - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_cxx_compilerclangxxpython3.6.yaml b/.ci_support/osx_cxx_compilerclangxxpython3.6.yaml deleted file mode 100644 index bf7be64..0000000 --- a/.ci_support/osx_cxx_compilerclangxxpython3.6.yaml +++ /dev/null @@ -1,39 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.68.0 -build_number_decrement: -- '0' -cairo: -- '1.16' -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -freetype: -- 2.9.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.9' -pin_run_as_build: - boost: - max_pin: x.x.x - cairo: - max_pin: x.x - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_cxx_compilerclangxxpython3.7.yaml b/.ci_support/osx_cxx_compilerclangxxpython3.7.yaml deleted file mode 100644 index 0f027e4..0000000 --- a/.ci_support/osx_cxx_compilerclangxxpython3.7.yaml +++ /dev/null @@ -1,39 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.68.0 -build_number_decrement: -- '0' -cairo: -- '1.16' -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -freetype: -- 2.9.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.9' -pin_run_as_build: - boost: - max_pin: x.x.x - cairo: - max_pin: x.x - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_cxx_compilertoolchain_cxxpython2.7.yaml b/.ci_support/osx_python2.7.yaml similarity index 74% rename from .ci_support/osx_cxx_compilertoolchain_cxxpython2.7.yaml rename to .ci_support/osx_python2.7.yaml index 7d23e9c..878f5d6 100644 --- a/.ci_support/osx_cxx_compilertoolchain_cxxpython2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -2,8 +2,6 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' boost: - 1.68.0 -build_number_decrement: -- '1000' cairo: - '1.16' channel_sources: @@ -11,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx freetype: - 2.9.1 macos_machine: @@ -32,8 +30,3 @@ pin_run_as_build: max_pin: x.x python: - '2.7' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_cxx_compilertoolchain_cxxpython3.6.yaml b/.ci_support/osx_python3.6.yaml similarity index 74% rename from .ci_support/osx_cxx_compilertoolchain_cxxpython3.6.yaml rename to .ci_support/osx_python3.6.yaml index f940878..0ea9f0b 100644 --- a/.ci_support/osx_cxx_compilertoolchain_cxxpython3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -2,8 +2,6 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' boost: - 1.68.0 -build_number_decrement: -- '1000' cairo: - '1.16' channel_sources: @@ -11,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx freetype: - 2.9.1 macos_machine: @@ -32,8 +30,3 @@ pin_run_as_build: max_pin: x.x python: - '3.6' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_cxx_compilertoolchain_cxxpython3.7.yaml b/.ci_support/osx_python3.7.yaml similarity index 74% rename from .ci_support/osx_cxx_compilertoolchain_cxxpython3.7.yaml rename to .ci_support/osx_python3.7.yaml index 9ac0c28..b927a8c 100644 --- a/.ci_support/osx_cxx_compilertoolchain_cxxpython3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -2,8 +2,6 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' boost: - 1.68.0 -build_number_decrement: -- '1000' cairo: - '1.16' channel_sources: @@ -11,7 +9,7 @@ channel_sources: channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx freetype: - 2.9.1 macos_machine: @@ -32,8 +30,3 @@ pin_run_as_build: max_pin: x.x python: - '3.7' -zip_keys: -- - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh index cc002c4..1301eb6 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 # make the build number clobber @@ -35,8 +32,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 7727c49..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_cxx_compilergxxpython2.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_cxx_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_cxx_compilergxxpython3.6: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_cxx_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_cxx_compilergxxpython3.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_cxx_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_cxx_compilertoolchain_cxxpython2.7: + build_linux_python2.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_cxx_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_cxx_compilertoolchain_cxxpython3.6: + build_linux_python3.6: working_directory: ~/test machine: true environment: - - CONFIG: "linux_cxx_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_cxx_compilertoolchain_cxxpython3.7: + build_linux_python3.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_cxx_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_cxx_compilergxxpython2.7 - - build_linux_cxx_compilergxxpython3.6 - - build_linux_cxx_compilergxxpython3.7 - - build_linux_cxx_compilertoolchain_cxxpython2.7 - - build_linux_cxx_compilertoolchain_cxxpython3.6 - - build_linux_cxx_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 2b215da..bb8a025 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ # 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 @@ -9,12 +10,9 @@ osx_image: xcode9.4 env: matrix: - - CONFIG=osx_cxx_compilerclangxxpython2.7 - - CONFIG=osx_cxx_compilerclangxxpython3.6 - - CONFIG=osx_cxx_compilerclangxxpython3.7 - - CONFIG=osx_cxx_compilertoolchain_cxxpython2.7 - - CONFIG=osx_cxx_compilertoolchain_cxxpython3.6 - - CONFIG=osx_cxx_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 a29f51c..3b6a224 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@ + + About rdkit =========== -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) - Home: http://rdkit.org Package license: BSD 3-Clause @@ -52,6 +54,8 @@ conda search rdkit --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 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8863467..43699a7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "rdkit" %} -{% set version = "2018.09.1" %} +{% set version = "2018.09.2" %} {% set filename = "Release_%s.tar.gz" % version.replace(".", "_") %} package: @@ -9,12 +9,12 @@ package: source: fn: {{ filename }} url: https://github.com/rdkit/rdkit/archive/{{ filename }} - sha256: 61c14652a05a6f6b216ff099381c4dd32048861ba9d96f75a017084e81848baa + sha256: 02d805c579797cdbe127fdcf659fb82e7ad4d3b29ecd421b995d2f87b69962d3 patches: - vs2015.patch # [win and py>=35] build: - number: 1001 + number: 0 skip: true # [win and py27] requirements: