From 68d9b91d7e0fc0390e52893b6d23ee95335b845e Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 11 May 2023 02:58:50 -0500 Subject: [PATCH] cvxopt v1.3.1 (#69) * updated v1.3.1 * MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.10.19.15.41 --- .azure-pipelines/azure-pipelines-win.yml | 8 ++++++-- .ci_support/linux_64_python3.10.____cpython.yaml | 2 +- .ci_support/linux_64_python3.11.____cpython.yaml | 2 +- .ci_support/linux_64_python3.8.____73_pypy.yaml | 2 +- .ci_support/linux_64_python3.8.____cpython.yaml | 2 +- .ci_support/linux_64_python3.9.____73_pypy.yaml | 2 +- .ci_support/linux_64_python3.9.____cpython.yaml | 2 +- .ci_support/linux_aarch64_python3.10.____cpython.yaml | 2 +- .ci_support/linux_aarch64_python3.11.____cpython.yaml | 2 +- .ci_support/linux_aarch64_python3.8.____73_pypy.yaml | 2 +- .ci_support/linux_aarch64_python3.8.____cpython.yaml | 2 +- .ci_support/linux_aarch64_python3.9.____73_pypy.yaml | 2 +- .ci_support/linux_aarch64_python3.9.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_python3.10.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_python3.11.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_python3.8.____73_pypy.yaml | 2 +- .ci_support/linux_ppc64le_python3.8.____cpython.yaml | 2 +- .ci_support/linux_ppc64le_python3.9.____73_pypy.yaml | 2 +- .ci_support/linux_ppc64le_python3.9.____cpython.yaml | 2 +- .ci_support/osx_64_python3.10.____cpython.yaml | 2 +- .ci_support/osx_64_python3.11.____cpython.yaml | 2 +- .ci_support/osx_64_python3.8.____73_pypy.yaml | 2 +- .ci_support/osx_64_python3.8.____cpython.yaml | 2 +- .ci_support/osx_64_python3.9.____73_pypy.yaml | 2 +- .ci_support/osx_64_python3.9.____cpython.yaml | 2 +- .ci_support/osx_arm64_python3.10.____cpython.yaml | 2 +- .ci_support/osx_arm64_python3.11.____cpython.yaml | 2 +- .ci_support/osx_arm64_python3.8.____cpython.yaml | 2 +- .ci_support/osx_arm64_python3.9.____cpython.yaml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 8 ++++---- recipe/meta.yaml | 6 +++--- 33 files changed, 45 insertions(+), 41 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 088335b..6eb9eaf 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_python3.10.____cpython: @@ -29,6 +29,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp steps: - task: PythonScript@0 @@ -50,7 +51,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 @@ -87,6 +88,9 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "TEMP=$(UPLOAD_TEMP)" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" call activate base upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index f8d069f..42e9537 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml index 79a240f..cee9733 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.8.____73_pypy.yaml b/.ci_support/linux_64_python3.8.____73_pypy.yaml index a98d8f3..930ddde 100644 --- a/.ci_support/linux_64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.8.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index b767596..c60d3e9 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.9.____73_pypy.yaml b/.ci_support/linux_64_python3.9.____73_pypy.yaml index 3cbfa28..8428ea8 100644 --- a/.ci_support/linux_64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 1b668d7..fa0f319 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos6 channel_sources: diff --git a/.ci_support/linux_aarch64_python3.10.____cpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpython.yaml index 561c627..6cdd259 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.11.____cpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpython.yaml index 481ce56..a68ee48 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml index dc2d814..de1729f 100644 --- a/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.8.____73_pypy.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.8.____cpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpython.yaml index a269314..577267d 100644 --- a/.ci_support/linux_aarch64_python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml index f44af5a..3b98b6d 100644 --- a/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_aarch64_python3.9.____73_pypy.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_aarch64_python3.9.____cpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpython.yaml index 551ee8b..7cd02d3 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_arch: - aarch64 cdt_name: diff --git a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml index 6709675..f5286c6 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos7 channel_sources: diff --git a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml index 72a8667..940d86c 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos7 channel_sources: diff --git a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml index 6f23c66..797fc77 100644 --- a/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos7 channel_sources: diff --git a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml index 438451c..82b72b4 100644 --- a/.ci_support/linux_ppc64le_python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos7 channel_sources: diff --git a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml index 70d41e0..16f01e9 100644 --- a/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos7 channel_sources: diff --git a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml index 21f7baf..13d8c47 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '10' +- '12' cdt_name: - cos7 channel_sources: diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 2b75ea7..3b75a81 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml index 0aaec81..ee8edcb 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____73_pypy.yaml b/.ci_support/osx_64_python3.8.____73_pypy.yaml index 97a96d1..21c071b 100644 --- a/.ci_support/osx_64_python3.8.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.8.____73_pypy.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 0391657..8ed4425 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____73_pypy.yaml b/.ci_support/osx_64_python3.9.____73_pypy.yaml index b3927d3..45f6acb 100644 --- a/.ci_support/osx_64_python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_python3.9.____73_pypy.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index dea785a..4cc93ec 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index dc42c2c..5df6af9 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index c54badd..0e7d8d1 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index f605942..3a44b22 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 8b95ecb..b38da4b 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index b80dc2c..1c15e35 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About cvxopt -============ +About cvxopt-feedstock +====================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/cvxopt-feedstock/blob/main/LICENSE.txt) Home: https://cvxopt.org Package license: GPL-3.0-or-later -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/cvxopt-feedstock/blob/main/LICENSE.txt) - Summary: Convex optimization package Development: https://github.com/cvxopt/cvxopt diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5c9ba75..af8c526 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.3.0" %} +{% set version = "1.3.1" %} {% set suitesparse_for_win_version = "5.7.2" %} package: @@ -7,7 +7,7 @@ package: source: - url: https://pypi.io/packages/source/c/cvxopt/cvxopt-{{ version }}.tar.gz - sha256: 00b1b232f9d1f902d578a9d75814b67fa020758d5ae422e28ca8cef6269fa5c6 + sha256: 8d567981cbfa2a4ba1667b3e6f73cb941cf1c6992bf1438911035963294aa498 # on windows, building suitesparse in directly works much better than trying to build it separately and link it in - url: https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v{{ suitesparse_for_win_version }}.tar.gz # [win] @@ -18,7 +18,7 @@ source: build: skip: true # [py<35] - number: 4 + number: 0 requirements: build: