From 27173cc5811f3c9854d69e1bcd6cb552512e36b5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 7 Jun 2024 18:19:04 +0000 Subject: [PATCH] Loosen proj pin to 9.4 --- .ci_support/migrations/proj_loosen_pin.yaml | 8 ++++++++ recipe/conda_build_config.yaml | 3 ++- recipe/meta.yaml | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 .ci_support/migrations/proj_loosen_pin.yaml diff --git a/.ci_support/migrations/proj_loosen_pin.yaml b/.ci_support/migrations/proj_loosen_pin.yaml new file mode 100644 index 0000000..3830824 --- /dev/null +++ b/.ci_support/migrations/proj_loosen_pin.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Loosen proj pin to 9.4 + kind: version + migration_number: 1 +migrator_ts: 1717700335 +proj: +- '9.4' diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 0a1e466..aa4ae33 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,4 @@ -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] +c_stdlib_version: # [osx and x86_64] - "10.15" # [osx and x86_64] MACOSX_SDK_VERSION: # [osx and x86_64] - "10.15" # [osx and x86_64] @@ -6,3 +6,4 @@ c_compiler: # [win] - vs2019 # [win] cxx_compiler: # [win] - vs2019 # [win] + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 60988d3..0cc59fa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: a38033aa8bd5845c55ad10f9bf5aaee932177e3aa88cf8f174814d825d354285 build: - number: 0 + number: 1 skip: true # [win] detect_binary_files_with_prefix: true @@ -19,6 +19,7 @@ requirements: - cmake - make - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - m2-bash # [win] - m2-findutils # [win] @@ -53,7 +54,6 @@ requirements: - libiconv # [win] - zlib - magics-python - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] run_constrained: # magics is incompatible with magics-metview - magics-metview ==9999999999