From 8dd78cad922af5bdc7d819becfe54020fe53ecaf Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 6 Aug 2021 13:48:25 +0300 Subject: [PATCH 1/7] add manual migration for pypy37_windows --- .ci_support/migrations/pypy37_windows.yaml | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .ci_support/migrations/pypy37_windows.yaml diff --git a/.ci_support/migrations/pypy37_windows.yaml b/.ci_support/migrations/pypy37_windows.yaml new file mode 100644 index 00000000..e2c7637b --- /dev/null +++ b/.ci_support/migrations/pypy37_windows.yaml @@ -0,0 +1,34 @@ +migrator_ts: 1623865877 +__migrator: + paused: False + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy # new entry + longterm: True + pr_limit: 6 + bump_number: 0 + wait_for_migrators: + - pypy37 + commit_message: "Rebuild for PyPy3.7 for windows" + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + +python: # [win] + - 3.7.* *_73_pypy # [win] +# additional entries to add for zip_keys +numpy: # [win] + - 1.19 # [win] +python_impl: # [win] + - pypy # [win] + From 608f62df9b37a50d2977d735b65056f645661418 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 6 Aug 2021 13:52:51 +0300 Subject: [PATCH 2/7] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.11.0, and conda-forge-pinning 2021.08.05.18.49.42 --- .azure-pipelines/azure-pipelines-linux.yml | 18 ++-- .azure-pipelines/azure-pipelines-osx.yml | 15 ++- .azure-pipelines/azure-pipelines-win.yml | 21 ++-- ...8python3.6.____73_pypypython_implpypy.yaml | 44 --------- ...hon3.6.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 2 +- ...8python3.6.____73_pypypython_implpypy.yaml | 46 --------- ...hon3.6.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.6.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 2 +- .ci_support/migrations/pypy.yaml | 47 --------- ...8python3.6.____73_pypypython_implpypy.yaml | 38 ------- ...hon3.6.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.6.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.7.____cpythonpython_implcpython.yaml} | 2 +- ...hon3.8.____cpythonpython_implcpython.yaml} | 2 +- ...python3.7.____73_pypypython_implpypy.yaml} | 20 +--- ...hon3.9.____cpythonpython_implcpython.yaml} | 0 .drone.yml | 43 ++------ .travis.yml | 11 +-- README.md | 99 ++++++++----------- 27 files changed, 93 insertions(+), 339 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.18python3.6.____73_pypypython_implpypy.yaml rename .ci_support/{linux_64_numpy1.17python3.6.____cpythonpython_implcpython.yaml => linux_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.17python3.7.____cpythonpython_implcpython.yaml => linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_64_numpy1.17python3.8.____cpythonpython_implcpython.yaml => linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml} (98%) delete mode 100644 .ci_support/linux_aarch64_numpy1.18python3.6.____73_pypypython_implpypy.yaml rename .ci_support/{linux_aarch64_numpy1.17python3.6.____cpythonpython_implcpython.yaml => linux_aarch64_numpy1.18python3.6.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.17python3.7.____cpythonpython_implcpython.yaml => linux_aarch64_numpy1.18python3.7.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_aarch64_numpy1.17python3.8.____cpythonpython_implcpython.yaml => linux_aarch64_numpy1.18python3.8.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.17python3.6.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy1.18python3.6.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.17python3.7.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{linux_ppc64le_numpy1.17python3.8.____cpythonpython_implcpython.yaml => linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython.yaml} (98%) delete mode 100644 .ci_support/migrations/pypy.yaml delete mode 100644 .ci_support/osx_64_numpy1.18python3.6.____73_pypypython_implpypy.yaml rename .ci_support/{osx_64_numpy1.17python3.6.____cpythonpython_implcpython.yaml => osx_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.17python3.7.____cpythonpython_implcpython.yaml => osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{osx_64_numpy1.17python3.8.____cpythonpython_implcpython.yaml => osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml} (98%) rename .ci_support/{win_64_numpy1.17python3.6.____cpython.yaml => win_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml} (97%) rename .ci_support/{win_64_numpy1.17python3.7.____cpython.yaml => win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml} (97%) rename .ci_support/{win_64_numpy1.17python3.8.____cpython.yaml => win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml} (97%) rename .ci_support/{linux_ppc64le_numpy1.18python3.6.____73_pypypython_implpypy.yaml => win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml} (57%) rename .ci_support/{win_64_numpy1.19python3.9.____cpython.yaml => win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml} (100%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 2817246f..24e4d0a8 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,23 +5,19 @@ jobs: - job: linux pool: - vmImage: ubuntu-16.04 + vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.17python3.6.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.17python3.6.____cpythonpython_implcpython + linux_64_numpy1.18python3.6.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.18python3.6.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.17python3.7.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.17python3.7.____cpythonpython_implcpython + linux_64_numpy1.18python3.7.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.18python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.17python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_numpy1.17python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 - linux_64_numpy1.18python3.6.____73_pypypython_implpypy: - CONFIG: linux_64_numpy1.18python3.6.____73_pypypython_implpypy + linux_64_numpy1.18python3.8.____cpythonpython_implcpython: + CONFIG: linux_64_numpy1.18python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.19python3.7.____73_pypypython_implpypy: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 89ed3d6e..a8db80dc 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,14 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.17python3.6.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.17python3.6.____cpythonpython_implcpython + osx_64_numpy1.18python3.6.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.18python3.6.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.17python3.7.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.17python3.7.____cpythonpython_implcpython + osx_64_numpy1.18python3.7.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.18python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.17python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_numpy1.17python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.18python3.6.____73_pypypython_implpypy: - CONFIG: osx_64_numpy1.18python3.6.____73_pypypython_implpypy + osx_64_numpy1.18python3.8.____cpythonpython_implcpython: + CONFIG: osx_64_numpy1.18python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.19python3.7.____73_pypypython_implpypy: CONFIG: osx_64_numpy1.19python3.7.____73_pypypython_implpypy diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index f993336b..76e13fee 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,17 +8,20 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.17python3.6.____cpython: - CONFIG: win_64_numpy1.17python3.6.____cpython + win_64_numpy1.18python3.6.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.18python3.6.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.17python3.7.____cpython: - CONFIG: win_64_numpy1.17python3.7.____cpython + win_64_numpy1.18python3.7.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.18python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.17python3.8.____cpython: - CONFIG: win_64_numpy1.17python3.8.____cpython + win_64_numpy1.18python3.8.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.18python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_numpy1.19python3.9.____cpython: - CONFIG: win_64_numpy1.19python3.9.____cpython + win_64_numpy1.19python3.7.____73_pypypython_implpypy: + CONFIG: win_64_numpy1.19python3.7.____73_pypypython_implpypy + UPLOAD_PACKAGES: 'True' + win_64_numpy1.19python3.9.____cpythonpython_implcpython: + CONFIG: win_64_numpy1.19python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: @@ -95,7 +98,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_numpy1.18python3.6.____73_pypypython_implpypy.yaml b/.ci_support/linux_64_numpy1.18python3.6.____73_pypypython_implpypy.yaml deleted file mode 100644 index 4655c476..00000000 --- a/.ci_support/linux_64_numpy1.18python3.6.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,44 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -freetype: -- '2' -numpy: -- '1.18' -pin_run_as_build: - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x - tk: - max_pin: x.x -python: -- 3.6.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - cdt_name - - docker_image -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_64_numpy1.17python3.6.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.17python3.6.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml index 683e9e00..c6870f0e 100644 --- a/.ci_support/linux_64_numpy1.17python3.6.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_64_numpy1.17python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.17python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index e79b08b6..55f4b060 100644 --- a/.ci_support/linux_64_numpy1.17python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_64_numpy1.17python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_64_numpy1.17python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index 33bedae4..0a28c9fe 100644 --- a/.ci_support/linux_64_numpy1.17python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypypython_implpypy.yaml b/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypypython_implpypy.yaml deleted file mode 100644 index 0b530007..00000000 --- a/.ci_support/linux_aarch64_numpy1.18python3.6.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,46 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -freetype: -- '2' -numpy: -- '1.18' -pin_run_as_build: - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x - tk: - max_pin: x.x -python: -- 3.6.* *_73_pypy -python_impl: -- pypy -target_platform: -- linux-aarch64 -tk: -- '8.6' -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/linux_aarch64_numpy1.17python3.6.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.6.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.17python3.6.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy1.18python3.6.____cpythonpython_implcpython.yaml index 7508a21a..86cde896 100644 --- a/.ci_support/linux_aarch64_numpy1.17python3.6.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.6.____cpythonpython_implcpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_aarch64_numpy1.17python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.7.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.17python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index 220a7747..8921c9b5 100644 --- a/.ci_support/linux_aarch64_numpy1.17python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_aarch64_numpy1.17python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_aarch64_numpy1.17python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_aarch64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index 25cb67c4..e142ec03 100644 --- a/.ci_support/linux_aarch64_numpy1.17python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -21,7 +21,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_ppc64le_numpy1.17python3.6.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.6.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.17python3.6.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy1.18python3.6.____cpythonpython_implcpython.yaml index aa663855..d00c4b27 100644 --- a/.ci_support/linux_ppc64le_numpy1.17python3.6.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.6.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_ppc64le_numpy1.17python3.7.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.17python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython.yaml index 44003a82..9f0c9358 100644 --- a/.ci_support/linux_ppc64le_numpy1.17python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_ppc64le_numpy1.17python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/linux_ppc64le_numpy1.17python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython.yaml index 1392eb54..50c68219 100644 --- a/.ci_support/linux_ppc64le_numpy1.17python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ docker_image: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/migrations/pypy.yaml b/.ci_support/migrations/pypy.yaml deleted file mode 100644 index c6321bc3..00000000 --- a/.ci_support/migrations/pypy.yaml +++ /dev/null @@ -1,47 +0,0 @@ -migrator_ts: 1580746218 # The timestamp of when the migration was made -__migrator: - kind: - version - exclude: - - c_compiler - - vc - - cxx_compiler - - cuda_compiler_version - - docker_image - migration_number: # Only use this if the bot messes up, putting this in will cause a complete rerun of the migration - 1 - bump_number: 1 # Hashes changed for cpython, so it's better to bump build numbers. - # do not use mamba to check if the issued PRs are solvable - check_solvable: false - -python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.6.* *_73_pypy # [not win64] - -numpy: - - 1.14 # [not (aarch64 or ppc64le)] - - 1.14 # [not (aarch64 or ppc64le)] - - 1.14 # [not (aarch64 or ppc64le)] - - 1.16 # [aarch64 or ppc64le] - - 1.16 # [aarch64 or ppc64le] - - 1.16 # [aarch64 or ppc64le] - - 1.18 # [not win64] - -python_impl: - - cpython - - cpython - - cpython - - pypy # [not win64] - - -zip_keys: - - - - python - - numpy - - python_impl - - # [linux64] - - cuda_compiler_version # [linux64] - - docker_image # [linux64] - diff --git a/.ci_support/osx_64_numpy1.18python3.6.____73_pypypython_implpypy.yaml b/.ci_support/osx_64_numpy1.18python3.6.____73_pypypython_implpypy.yaml deleted file mode 100644 index 6c7a9266..00000000 --- a/.ci_support/osx_64_numpy1.18python3.6.____73_pypypython_implpypy.yaml +++ /dev/null @@ -1,38 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.11' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '11' -freetype: -- '2' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - freetype: - max_pin: x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_73_pypy -python_impl: -- pypy -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - numpy - - python_impl diff --git a/.ci_support/osx_64_numpy1.17python3.6.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.17python3.6.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml index b83b7ca2..104b6418 100644 --- a/.ci_support/osx_64_numpy1.17python3.6.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ freetype: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/osx_64_numpy1.17python3.7.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.17python3.7.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index 13b26deb..79780b1f 100644 --- a/.ci_support/osx_64_numpy1.17python3.7.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ freetype: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/osx_64_numpy1.17python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml similarity index 98% rename from .ci_support/osx_64_numpy1.17python3.8.____cpythonpython_implcpython.yaml rename to .ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index 3b141e7d..e2895c0e 100644 --- a/.ci_support/osx_64_numpy1.17python3.8.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -17,7 +17,7 @@ freetype: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/win_64_numpy1.17python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.17python3.6.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml index b8b33766..fdea2b6c 100644 --- a/.ci_support/win_64_numpy1.17python3.6.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.6.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/win_64_numpy1.17python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.17python3.7.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml index 149d2229..a3788836 100644 --- a/.ci_support/win_64_numpy1.17python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.7.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/win_64_numpy1.17python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml similarity index 97% rename from .ci_support/win_64_numpy1.17python3.8.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml index 2d299280..91d455a9 100644 --- a/.ci_support/win_64_numpy1.17python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.8.____cpythonpython_implcpython.yaml @@ -9,7 +9,7 @@ cxx_compiler: freetype: - '2' numpy: -- '1.17' +- '1.18' pin_run_as_build: freetype: max_pin: x diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml similarity index 57% rename from .ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypypython_implpypy.yaml rename to .ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml index 8cb235b3..6668451d 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.6.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml @@ -1,23 +1,15 @@ c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 +- vs2017 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- gxx -cxx_compiler_version: -- '9' -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le +- vs2017 freetype: - '2' numpy: -- '1.18' +- '1.19' pin_run_as_build: freetype: max_pin: x @@ -25,14 +17,12 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.6.* *_73_pypy +- 3.7.* *_73_pypy python_impl: - pypy target_platform: -- linux-ppc64le +- win-64 zip_keys: -- - c_compiler_version - - cxx_compiler_version - - python - numpy - python_impl diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml similarity index 100% rename from .ci_support/win_64_numpy1.19python3.9.____cpython.yaml rename to .ci_support/win_64_numpy1.19python3.9.____cpythonpython_implcpython.yaml diff --git a/.drone.yml b/.drone.yml index ddc64355..e97d25be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: linux_aarch64_numpy1.17python3.6.___hbd74f1bd2d +name: linux_aarch64_numpy1.18python3.6.___h0f6feb4597 platform: os: linux @@ -10,7 +10,7 @@ steps: - name: Install and build image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.17python3.6.____cpythonpython_implcpython + CONFIG: linux_aarch64_numpy1.18python3.6.____cpythonpython_implcpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -31,7 +31,7 @@ steps: --- kind: pipeline -name: linux_aarch64_numpy1.17python3.7.___hcdfa3c3ca8 +name: linux_aarch64_numpy1.18python3.7.___h1cadc65bfe platform: os: linux @@ -41,7 +41,7 @@ steps: - name: Install and build image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.17python3.7.____cpythonpython_implcpython + CONFIG: linux_aarch64_numpy1.18python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -62,7 +62,7 @@ steps: --- kind: pipeline -name: linux_aarch64_numpy1.17python3.8.___hbbdfb36bbd +name: linux_aarch64_numpy1.18python3.8.___ha3ae6cc14c platform: os: linux @@ -72,38 +72,7 @@ steps: - name: Install and build image: quay.io/condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_numpy1.17python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - ---- -kind: pipeline -name: linux_aarch64_numpy1.18python3.6.___hfb0eb6ab4e - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_numpy1.18python3.6.____73_pypypython_implpypy + CONFIG: linux_aarch64_numpy1.18python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: diff --git a/.travis.yml b/.travis.yml index 898b6c2c..bdab7de2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,22 +7,17 @@ language: generic matrix: include: - - env: CONFIG=linux_ppc64le_numpy1.17python3.6.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.18python3.6.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal - - env: CONFIG=linux_ppc64le_numpy1.17python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal - - env: CONFIG=linux_ppc64le_numpy1.17python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_numpy1.18python3.6.____73_pypypython_implpypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le os: linux arch: ppc64le dist: focal diff --git a/README.md b/README.md index f8e66421..96de8b7a 100644 --- a/README.md +++ b/README.md @@ -52,31 +52,24 @@ Current build status - + - + - + - - - @@ -94,31 +87,24 @@ Current build status - + - + - + - - - @@ -136,31 +122,24 @@ Current build status - + - + - + - - - @@ -178,31 +157,24 @@ Current build status - - - - + - + - + @@ -234,31 +206,38 @@ Current build status - + + + + - + - + - + From ed14896ba4fcd13db088875d2bf5d30b11881849 Mon Sep 17 00:00:00 2001 From: mattip Date: Fri, 6 Aug 2021 16:35:20 +0300 Subject: [PATCH 3/7] add a fix for pypy-windows, can remove after the next pypy release --- recipe/meta.yaml | 1 + recipe/pre-7.3.6-0001.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 recipe/pre-7.3.6-0001.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a28c959d..448a0470 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,7 @@ source: sha256: e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675 patches: - pypi.patch # [python_impl == "pypy"] + - pre-7.3.6-0001.patch # [python_impl == "pypy" and win] build: diff --git a/recipe/pre-7.3.6-0001.patch b/recipe/pre-7.3.6-0001.patch new file mode 100644 index 00000000..7ec1390e --- /dev/null +++ b/recipe/pre-7.3.6-0001.patch @@ -0,0 +1,25 @@ +diff --git a/src/_c_internal_utils.c b/src/_c_internal_utils.c +index 4a61fe5b6e..c1949811d4 100644 +--- a/src/_c_internal_utils.c ++++ b/src/_c_internal_utils.c +@@ -68,7 +68,8 @@ mpl_GetCurrentProcessExplicitAppUserModelID(PyObject* module) + wchar_t* appid = NULL; + HRESULT hr = GetCurrentProcessExplicitAppUserModelID(&appid); + if (FAILED(hr)) { +- return PyErr_SetFromWindowsErr(hr); ++ PyErr_SetFromWindowsErr(hr); ++ return NULL; + } + PyObject* py_appid = PyUnicode_FromWideChar(appid, -1); + CoTaskMemFree(appid); +@@ -89,7 +90,8 @@ mpl_SetCurrentProcessExplicitAppUserModelID(PyObject* module, PyObject* arg) + HRESULT hr = SetCurrentProcessExplicitAppUserModelID(appid); + PyMem_Free(appid); + if (FAILED(hr)) { +- return PyErr_SetFromWindowsErr(hr); ++ PyErr_SetFromWindowsErr(hr); ++ return NULL; + } + Py_RETURN_NONE; + #else + From 9ee5713bbf39173ba2e9c5addd48dc8af5df37f5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 13 Aug 2021 04:18:37 +0000 Subject: [PATCH 4/7] updated v3.4.3 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 448a0470..d49859d1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ # Full credit goes to https://github.com/conda/conda-recipes for providing this recipe. # It has been subsequently adapted for automated building with conda-forge. -{% set version = "3.4.2" %} +{% set version = "3.4.3" %} package: name: matplotlib-suite @@ -9,7 +9,7 @@ package: source: url: https://github.com/matplotlib/matplotlib/archive/v{{ version }}.tar.gz - sha256: e5960bcb964ee77d37752f7a1db4568d85e99d8857fbf20289dda2edfa711675 + sha256: 474c4c5555476eb35f44cfd00a4c9b7b24fff9cef685ec80e52260cc33558b0c patches: - pypi.patch # [python_impl == "pypy"] - pre-7.3.6-0001.patch # [python_impl == "pypy" and win] From 8566e1e0e3717ac40d33fe63933dcc719e02b463 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Fri, 13 Aug 2021 13:46:24 -0600 Subject: [PATCH 5/7] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.08.12.05.10.51 --- ...py1.19python3.7.____73_pypypython_implpypy.yaml | 6 +----- .scripts/build_steps.sh | 8 -------- README.md | 14 -------------- 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml b/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml index 6668451d..a84462c0 100644 --- a/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml +++ b/.ci_support/win_64_numpy1.19python3.7.____73_pypypython_implpypy.yaml @@ -3,16 +3,12 @@ c_compiler: channel_sources: - conda-forge,defaults channel_targets: -- conda-forge main +- conda-forge testing cxx_compiler: - vs2017 -freetype: -- '2' numpy: - '1.19' pin_run_as_build: - freetype: - max_pin: x python: min_pin: x.x max_pin: x.x diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index add96e74..99baf86d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,14 +34,6 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source 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 mesa-libGL - - # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/README.md b/README.md index 96de8b7a..1a9af492 100644 --- a/README.md +++ b/README.md @@ -191,20 +191,6 @@ Current build status variant - - - - - -
VariantStatus
linux_64_numpy1.17python3.6.____cpythonpython_implcpythonlinux_64_numpy1.18python3.6.____cpythonpython_implcpython - variant + variant
linux_64_numpy1.17python3.7.____cpythonpython_implcpythonlinux_64_numpy1.18python3.7.____cpythonpython_implcpython - variant + variant
linux_64_numpy1.17python3.8.____cpythonpython_implcpythonlinux_64_numpy1.18python3.8.____cpythonpython_implcpython - variant - -
linux_64_numpy1.18python3.6.____73_pypypython_implpypy - - variant + variant
linux_aarch64_numpy1.17python3.6.____cpythonpython_implcpythonlinux_aarch64_numpy1.18python3.6.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.17python3.7.____cpythonpython_implcpythonlinux_aarch64_numpy1.18python3.7.____cpythonpython_implcpython - variant + variant
linux_aarch64_numpy1.17python3.8.____cpythonpython_implcpythonlinux_aarch64_numpy1.18python3.8.____cpythonpython_implcpython - variant - -
linux_aarch64_numpy1.18python3.6.____73_pypypython_implpypy - - variant + variant
linux_ppc64le_numpy1.17python3.6.____cpythonpython_implcpythonlinux_ppc64le_numpy1.18python3.6.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.17python3.7.____cpythonpython_implcpythonlinux_ppc64le_numpy1.18python3.7.____cpythonpython_implcpython - variant + variant
linux_ppc64le_numpy1.17python3.8.____cpythonpython_implcpythonlinux_ppc64le_numpy1.18python3.8.____cpythonpython_implcpython - variant - -
linux_ppc64le_numpy1.18python3.6.____73_pypypython_implpypy - - variant + variant
osx_64_numpy1.17python3.6.____cpythonpython_implcpython - - variant - -
osx_64_numpy1.17python3.7.____cpythonpython_implcpythonosx_64_numpy1.18python3.6.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.17python3.8.____cpythonpython_implcpythonosx_64_numpy1.18python3.7.____cpythonpython_implcpython - variant + variant
osx_64_numpy1.18python3.6.____73_pypypython_implpypyosx_64_numpy1.18python3.8.____cpythonpython_implcpython - variant + variant
win_64_numpy1.17python3.6.____cpythonwin_64_numpy1.18python3.6.____cpythonpython_implcpython + + variant + +
win_64_numpy1.18python3.7.____cpythonpython_implcpython - variant + variant
win_64_numpy1.17python3.7.____cpythonwin_64_numpy1.18python3.8.____cpythonpython_implcpython - variant + variant
win_64_numpy1.17python3.8.____cpythonwin_64_numpy1.19python3.7.____73_pypypython_implpypy - variant + variant
win_64_numpy1.19python3.9.____cpythonwin_64_numpy1.19python3.9.____cpythonpython_implcpython - variant + variant
osx_arm64_python3.8.____cpython - - variant - -
osx_arm64_python3.9.____cpython - - variant - -
win_64_numpy1.18python3.6.____cpythonpython_implcpython From c561e804db8b7c8db45cb8868154782b35470938 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Fri, 13 Aug 2021 16:30:54 -0600 Subject: [PATCH 6/7] Revert "Try not installing libGL any more" This reverts commit 09990b5821407280b5c519eb726ec6a2bb75e0e7. --- recipe/yum_requirements.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 recipe/yum_requirements.txt diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt new file mode 100644 index 00000000..0e16b14e --- /dev/null +++ b/recipe/yum_requirements.txt @@ -0,0 +1 @@ +mesa-libGL From 8d07a208e1f2e399796109263c623b68b617ce97 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Mon, 16 Aug 2021 15:14:12 -0600 Subject: [PATCH 7/7] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.08.14.10.30.44 --- .scripts/build_steps.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 99baf86d..add96e74 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,6 +34,14 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source 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 mesa-libGL + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"