From 0dfa35b32d26d67a2dc85090f716ebe8d4af2398 Mon Sep 17 00:00:00 2001 From: conda-forge-linter Date: Thu, 5 Aug 2021 13:30:45 +0000 Subject: [PATCH 1/2] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.11.0, and conda-forge-pinning 2021.08.05.06.02.11 --- .ci_support/linux_64_.yaml | 18 ++++++++---------- .ci_support/migrations/pcre21037.yaml | 7 ------- .ci_support/osx_64_.yaml | 16 ++++++---------- 3 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 .ci_support/migrations/pcre21037.yaml diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 770460fe..74e6ade4 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -18,22 +18,22 @@ cxx_compiler_version: - '9' docker_image: - quay.io/condaforge/linux-anvil-comp7 -fftw: -- '3' fortran_compiler: - gfortran fortran_compiler_version: - '9' gmp: - '6' -libblas: -- 3.8 *netlib -libcblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib +libgit2: +- '1.1' +libssh2: +- '1' +libunwind: +- '1' mpfr: - '4' +pcre2: +- '10.37' perl: - 5.26.2 pin_run_as_build: @@ -41,8 +41,6 @@ pin_run_as_build: max_pin: x.x.x curl: max_pin: x - fftw: - max_pin: x gmp: max_pin: x mpfr: diff --git a/.ci_support/migrations/pcre21037.yaml b/.ci_support/migrations/pcre21037.yaml deleted file mode 100644 index 43cf4037..00000000 --- a/.ci_support/migrations/pcre21037.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -migrator_ts: 1622491612.3316026 -pcre2: -- '10.37' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c2447382..ae94f808 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -16,24 +16,22 @@ cxx_compiler: - clangxx cxx_compiler_version: - '11' -fftw: -- '3' fortran_compiler: - gfortran fortran_compiler_version: - '9' gmp: - '6' -libblas: -- 3.8 *netlib -libcblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib +libgit2: +- '1.1' +libssh2: +- '1' macos_machine: - x86_64-apple-darwin13.4.0 mpfr: - '4' +pcre2: +- '10.37' perl: - 5.26.2 pin_run_as_build: @@ -41,8 +39,6 @@ pin_run_as_build: max_pin: x.x.x curl: max_pin: x - fftw: - max_pin: x gmp: max_pin: x mpfr: From c9bdf28812700b85ebf7f4ec3e4cd221979a582e Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Thu, 5 Aug 2021 12:42:04 -0400 Subject: [PATCH 2/2] Apply suggestions from code review by @isuruf All suggestions were applied Co-authored-by: Isuru Fernando --- recipe/build.sh | 1 + recipe/meta.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 9fb49786..280f469e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -27,6 +27,7 @@ then export EXTRA_MAKEFLAGS="USE_SYSTEM_LIBGIT2=1" fi +# using system utf8proc can be enabled in 1.7.0. See https://github.com/JuliaLang/julia/commit/ba653ecb1c81f1465505c2cea38b4f8149dd20b3 make -j 4 prefix=${PREFIX} MARCH=core2 sysconfigdir=${PREFIX}/etc \ LIBBLAS=-lopenblas64_ LIBBLASNAME=libopenblas64_ LIBLAPACK=-lopenblas64_ LIBLAPACKNAME=libopenblas64_ \ USE_SYSTEM_ARPACK=1 \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9a4d8a90..083ee82a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,7 +30,7 @@ requirements: - gmp - mpfr - curl - - libgit2 + - libgit2 # [not osx] - libssh2 - libosxunwind # [osx] - libunwind # [linux] @@ -53,7 +53,7 @@ requirements: - suitesparse - pcre2 - curl - - libgit2 + - libgit2 # [not osx] - libssh2 - git - libnghttp2