From d17eac3e588d35b9e8657edb2799f43d4bf8fbfb Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2019 09:08:34 -0500 Subject: [PATCH 01/19] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fcf2337..42f8930 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ source: sha256: 6dafe2fe3a9994ab2359f8bf8f6bad04dc4f936918999cf01e026323882b6b77 build: - number: 1003 + number: 1004 skip: True # [win] detect_binary_files_with_prefix: true From f1b652491cd05e9c266fc846d4bc8d319b8430ab Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Mon, 26 Aug 2019 14:10:06 +0000 Subject: [PATCH 02/19] MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.1, and conda-forge-pinning 2019.08.22 --- .azure-pipelines/azure-pipelines-osx.yml | 21 +++++-- .azure-pipelines/run_docker_build.sh | 2 +- .ci_support/linux_python2.7.yaml | 4 +- .ci_support/linux_python3.6.yaml | 4 +- .ci_support/linux_python3.7.yaml | 4 +- ...x_fortran_compiler_version4python2.7.yaml} | 4 +- ...x_fortran_compiler_version4python3.6.yaml} | 4 +- ...x_fortran_compiler_version4python3.7.yaml} | 4 +- ...sx_fortran_compiler_version7python2.7.yaml | 52 ++++++++++++++++++ ...sx_fortran_compiler_version7python3.6.yaml | 52 ++++++++++++++++++ ...sx_fortran_compiler_version7python3.7.yaml | 52 ++++++++++++++++++ .github/CODEOWNERS | 1 + .github/CONTRIBUTING.md | 15 ----- .github/ISSUE_TEMPLATE.md | 25 --------- .github/PULL_REQUEST_TEMPLATE.md | 18 ------ README.md | 33 +++++++++-- __pycache__/build-locally.cpython-36.pyc | Bin 1897 -> 0 bytes build-locally.py | 4 +- 18 files changed, 214 insertions(+), 85 deletions(-) rename .ci_support/{osx_python2.7.yaml => osx_fortran_compiler_version4python2.7.yaml} (97%) rename .ci_support/{osx_python3.6.yaml => osx_fortran_compiler_version4python3.6.yaml} (97%) rename .ci_support/{osx_python3.7.yaml => osx_fortran_compiler_version4python3.7.yaml} (97%) create mode 100644 .ci_support/osx_fortran_compiler_version7python2.7.yaml create mode 100644 .ci_support/osx_fortran_compiler_version7python3.6.yaml create mode 100644 .ci_support/osx_fortran_compiler_version7python3.7.yaml create mode 100644 .github/CODEOWNERS delete mode 100644 .github/CONTRIBUTING.md delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 __pycache__/build-locally.cpython-36.pyc diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index bc6f0f8..c496b05 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -10,14 +10,23 @@ jobs: strategy: maxParallel: 8 matrix: - osx_python2.7: - CONFIG: osx_python2.7 + osx_fortran_compiler_version4python2.7: + CONFIG: osx_fortran_compiler_version4python2.7 UPLOAD_PACKAGES: True - osx_python3.6: - CONFIG: osx_python3.6 + osx_fortran_compiler_version4python3.6: + CONFIG: osx_fortran_compiler_version4python3.6 UPLOAD_PACKAGES: True - osx_python3.7: - CONFIG: osx_python3.7 + osx_fortran_compiler_version4python3.7: + CONFIG: osx_fortran_compiler_version4python3.7 + UPLOAD_PACKAGES: True + osx_fortran_compiler_version7python2.7: + CONFIG: osx_fortran_compiler_version7python2.7 + UPLOAD_PACKAGES: True + osx_fortran_compiler_version7python3.6: + CONFIG: osx_fortran_compiler_version7python3.6 + UPLOAD_PACKAGES: True + osx_fortran_compiler_version7python3.7: + CONFIG: osx_fortran_compiler_version7python3.7 UPLOAD_PACKAGES: True steps: diff --git a/.azure-pipelines/run_docker_build.sh b/.azure-pipelines/run_docker_build.sh index 3524f61..f0e77cd 100755 --- a/.azure-pipelines/run_docker_build.sh +++ b/.azure-pipelines/run_docker_build.sh @@ -39,7 +39,7 @@ if [ -z "$CONFIG" ]; then fi if [ -z "${DOCKER_IMAGE}" ]; then - SHYAML_INSTALLED="$(shyaml --version || echo NO)" + SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" DOCKER_IMAGE="condaforge/linux-anvil-comp7" diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml index eff34be..a78e4c0 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -25,11 +25,11 @@ jasper: libnetcdf: - 4.6.2 libpng: -- 1.6.35 +- '1.6' numpy: - '1.14' perl: -- '5.26' +- 5.26.2 pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index f2a2efc..eb46877 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -25,11 +25,11 @@ jasper: libnetcdf: - 4.6.2 libpng: -- 1.6.35 +- '1.6' numpy: - '1.14' perl: -- '5.26' +- 5.26.2 pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml index 9ce541c..51bcc8c 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -25,11 +25,11 @@ jasper: libnetcdf: - 4.6.2 libpng: -- 1.6.35 +- '1.6' numpy: - '1.14' perl: -- '5.26' +- 5.26.2 pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_fortran_compiler_version4python2.7.yaml similarity index 97% rename from .ci_support/osx_python2.7.yaml rename to .ci_support/osx_fortran_compiler_version4python2.7.yaml index 14273f2..c958b93 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_fortran_compiler_version4python2.7.yaml @@ -25,7 +25,7 @@ jasper: libnetcdf: - 4.6.2 libpng: -- 1.6.35 +- '1.6' macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -33,7 +33,7 @@ macos_min_version: numpy: - '1.14' perl: -- '5.26' +- 5.26.2 pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_fortran_compiler_version4python3.6.yaml similarity index 97% rename from .ci_support/osx_python3.6.yaml rename to .ci_support/osx_fortran_compiler_version4python3.6.yaml index a0f3555..54aa619 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_fortran_compiler_version4python3.6.yaml @@ -25,7 +25,7 @@ jasper: libnetcdf: - 4.6.2 libpng: -- 1.6.35 +- '1.6' macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -33,7 +33,7 @@ macos_min_version: numpy: - '1.14' perl: -- '5.26' +- 5.26.2 pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_fortran_compiler_version4python3.7.yaml similarity index 97% rename from .ci_support/osx_python3.7.yaml rename to .ci_support/osx_fortran_compiler_version4python3.7.yaml index 26918a7..5159bac 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_fortran_compiler_version4python3.7.yaml @@ -25,7 +25,7 @@ jasper: libnetcdf: - 4.6.2 libpng: -- 1.6.35 +- '1.6' macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -33,7 +33,7 @@ macos_min_version: numpy: - '1.14' perl: -- '5.26' +- 5.26.2 pin_run_as_build: boost: max_pin: x.x.x diff --git a/.ci_support/osx_fortran_compiler_version7python2.7.yaml b/.ci_support/osx_fortran_compiler_version7python2.7.yaml new file mode 100644 index 0000000..7b94518 --- /dev/null +++ b/.ci_support/osx_fortran_compiler_version7python2.7.yaml @@ -0,0 +1,52 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +boost: +- 1.70.0 +c_compiler: +- clang +c_compiler_version: +- '4' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '4' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '7' +hdf5: +- 1.10.5 +jasper: +- 1.900.1 +libnetcdf: +- 4.6.2 +libpng: +- '1.6' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.14' +perl: +- 5.26.2 +pin_run_as_build: + boost: + max_pin: x.x.x + jasper: + max_pin: x + libnetcdf: + max_pin: x.x.x + libpng: + max_pin: x.x + perl: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' diff --git a/.ci_support/osx_fortran_compiler_version7python3.6.yaml b/.ci_support/osx_fortran_compiler_version7python3.6.yaml new file mode 100644 index 0000000..c52f48a --- /dev/null +++ b/.ci_support/osx_fortran_compiler_version7python3.6.yaml @@ -0,0 +1,52 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +boost: +- 1.70.0 +c_compiler: +- clang +c_compiler_version: +- '4' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '4' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '7' +hdf5: +- 1.10.5 +jasper: +- 1.900.1 +libnetcdf: +- 4.6.2 +libpng: +- '1.6' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.14' +perl: +- 5.26.2 +pin_run_as_build: + boost: + max_pin: x.x.x + jasper: + max_pin: x + libnetcdf: + max_pin: x.x.x + libpng: + max_pin: x.x + perl: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.ci_support/osx_fortran_compiler_version7python3.7.yaml b/.ci_support/osx_fortran_compiler_version7python3.7.yaml new file mode 100644 index 0000000..ce74947 --- /dev/null +++ b/.ci_support/osx_fortran_compiler_version7python3.7.yaml @@ -0,0 +1,52 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +boost: +- 1.70.0 +c_compiler: +- clang +c_compiler_version: +- '4' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '4' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '7' +hdf5: +- 1.10.5 +jasper: +- 1.900.1 +libnetcdf: +- 4.6.2 +libpng: +- '1.6' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.14' +perl: +- 5.26.2 +pin_run_as_build: + boost: + max_pin: x.x.x + jasper: + max_pin: x + libnetcdf: + max_pin: x.x.x + libpng: + max_pin: x.x + perl: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..0bfe8d9 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @kmuehlbauer @kynan @ocefpaf @pelson \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index d87090f..0000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,15 +0,0 @@ -Thanks for your interest in helping out conda-forge. - -Whether you are brand new or a seasoned maintainer, we always appreciate -feedback from the community about how we can improve conda-forge. If you -are submitting a PR or issue, please fill out the respective template. Should -any questions arise please feel free to ask the maintainer team of the -respective feedstock or reach out to `@conda-forge/core` for more complex -issues. - -In the case of any issues reported, please be sure to demonstrate the relevant -issue (even if it is an absence of a feature). Providing this information will -help busy maintainers understand what it is you hope to accomplish. Also this -will help provide them clues as to what might be going wrong. These examples -can also be reused as tests in the build to ensure further packages meet these -criteria. This is requested to help you get timely and relevant feedback. :) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index fc95334..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,25 +0,0 @@ - -Issue: - -
-Environment (conda list): -
- -``` -$ conda list - -``` -
- -
-Details about conda and system ( conda info ): -
- -``` -$ conda info - -``` -
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index ba618a2..0000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,18 +0,0 @@ - -Checklist -* [ ] Used a fork of the feedstock to propose changes -* [ ] Bumped the build number (if the version is unchanged) -* [ ] Reset the build number to `0` (if the version changed) -* [ ] [Re-rendered]( https://conda-forge.org/docs/maintainer/updating_pkgs.html#rerendering-feedstocks ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) -* [ ] Ensured the license file is being packaged. - - - - diff --git a/README.md b/README.md index a89d4a7..0bf4418 100644 --- a/README.md +++ b/README.md @@ -50,24 +50,45 @@ Current build status - osx_python2.7 + osx_fortran_compiler_version4python2.7 - variant + variant - osx_python3.6 + osx_fortran_compiler_version4python3.6 - variant + variant - osx_python3.7 + osx_fortran_compiler_version4python3.7 - variant + variant + + + + osx_fortran_compiler_version7python2.7 + + + variant + + + + osx_fortran_compiler_version7python3.6 + + + variant + + + + osx_fortran_compiler_version7python3.7 + + + variant diff --git a/__pycache__/build-locally.cpython-36.pyc b/__pycache__/build-locally.cpython-36.pyc deleted file mode 100644 index 11e11b20036d65011403a7f12f551eee6de57327..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1897 zcmZ8iOOF#r5bmCr$FsHpD*+beFiNB-Mqo!mN~CDDVZ%!i$RH6&WPwJr?p}L#$1_8B z8}P_`!Q>K&D9Rxhlpm14)Yn|H{~#g<^7YtjU@di5S5H;fS5IGQHiN65{rl(_kC4B~ zdp{fJt61_UY>Y6PlEISF0j+pzV1ZhxJ#hvOCCp~dOEPeo%REqz)tC=jV+~ek!Am;u zd7W(>SmFonF9_u6ebQ+j;dRpQP~F-Qqv?ca>Rv1)7ei`3;Ag18at%vfz&0oQMA3bV z(Jff7PBu;iuQ~mJckOQf=J&U>doxZYADnt{@6O$w>(RZPYqxi9-MHVewKvSOy=0`V zT0Zsva| zoBe8dMh<-O55CrozH*hPYD@hEtQ}g3G$>R%;tV8?IQFLy}3zzNgFp1=}C~~2C7rV1~l9uhKahkAjsU*W#@UZkA$RrzuWovak6|qY4?8sDO z>D|ny84Js=mnvbFt5EWk4;5#Z!Xo8B9}dTP4zefmNvOs+rPU2fJJ=4( z`mtJA)>e;|%`lPGlNBuOrb#w^US7(xbQaz*=QYydR0wn-?pGce^CN)iG{lC9rdx<4 zQ^Itpwo{&IyT}Xeq={6z&NB=txW%<65e?3?n`FgQX&X8^co?TsenW^{pzBmDlzfIk z(WxyvtyzIv1zHY*r5}ip)HKm_sHwy|?D>hj>E;I+`WV3E7uX2>h_+}z+tk4%3BU!^ z2iKx!K^vfLt8JlIKZoqP!c|!pwfd z%L;Qf9IHu#O2262X;DS;WPqGWoMc@HNHbgsygzL)BN0U%+V2Ea(^R<@ zMqK+aSXr(xy)(MRaQuMjtSEZVviYwN)u{BhCOMm?d>enFM7FWPv`K;OyT0RZ1{*&8 EA7BvHJ^%m! diff --git a/build-locally.py b/build-locally.py index a7d9c2d..51d6a6e 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # This file has been generated by conda-smithy in order to build the recipe # locally. @@ -55,4 +55,4 @@ def main(args=None): if __name__ == "__main__": - main() \ No newline at end of file + main() From 7c90d94d5c08bc0ae002d19913651c0ea27664eb Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2019 09:23:32 -0500 Subject: [PATCH 03/19] Update meta.yaml --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 42f8930..aa47063 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,15 +1,15 @@ -{% set version = "2.12.3" %} +{% set version = "2.13.1" %} package: name: python-eccodes version: {{ version }} source: - url: https://confluence.ecmwf.int/download/attachments/131371724/eccodes-{{ version }}-Source.tar.gz - sha256: 6dafe2fe3a9994ab2359f8bf8f6bad04dc4f936918999cf01e026323882b6b77 + url: https://confluence.ecmwf.int/download/attachments/45757960/eccodes-{{ version }}-Source.tar.gz + sha256: 158021539a85ca597075f4a534117721ea51f5ddea44b5ec27519d553c980f8d build: - number: 1004 + number: 0 skip: True # [win] detect_binary_files_with_prefix: true From c9c5d8d0a9f187d152297e3b18b4f98bab4bb8c9 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2019 09:26:27 -0500 Subject: [PATCH 04/19] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index aa47063..2f35f1f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -47,6 +47,7 @@ about: home: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home license: Apache 2.0 license_family: Apache + license_file: LICENSE summary: ECMWF ecCodes Copyright 2005-2018 ECMWF. extra: From fda05fc07b0d9b034ab5d737cfc2ca6c0e53a694 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2019 09:55:58 -0500 Subject: [PATCH 05/19] Update build.sh --- recipe/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index a8ec16c..c874ffd 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -37,3 +37,7 @@ if [[ $(uname) == Linux ]]; then fi make install + +if [[ "${PY3K}" == "1" ]]; then + pip install eccodes-python --vv --no-deps +fi From e198b81e59285607337a26b2f079889c25025937 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2019 10:07:55 -0500 Subject: [PATCH 06/19] Update build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index c874ffd..283cb03 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -39,5 +39,5 @@ fi make install if [[ "${PY3K}" == "1" ]]; then - pip install eccodes-python --vv --no-deps + ${PYTHON} -m pip install eccodes-python -vv --no-deps fi From e516ebb9a8737b1438693212d5180dcd5afc2692 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Mon, 26 Aug 2019 10:21:39 -0500 Subject: [PATCH 07/19] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2f35f1f..f91be64 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ requirements: - {{ compiler('cxx') }} host: - python + - pip - numpy - boost - jasper From cb045a7e6ca42338223711c7fb31859afd72fd55 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 06:51:30 -0500 Subject: [PATCH 08/19] Update meta.yaml --- recipe/meta.yaml | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f91be64..6b830af 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,43 +1,30 @@ -{% set version = "2.13.1" %} +{% set version = "0.9.2" %} package: name: python-eccodes version: {{ version }} source: - url: https://confluence.ecmwf.int/download/attachments/45757960/eccodes-{{ version }}-Source.tar.gz - sha256: 158021539a85ca597075f4a534117721ea51f5ddea44b5ec27519d553c980f8d + url: https://pypi.io/packages/source/e/eccodes-python/eccodes-python-{{ version }}.tar.gz + sha256: 587dd828ee5e13b6a7d35a362d6fd903d914dd0422f4010af95e8f45738e9143 build: number: 0 - skip: True # [win] + skip: True # [win or py2k] detect_binary_files_with_prefix: true requirements: - build: - - cmake - - perl - - {{ compiler('fortran') }} - - {{ compiler('c') }} - - {{ compiler('cxx') }} host: - python - pip - numpy - - boost - - jasper - - libpng - - libnetcdf - - hdf5 - - eccodes {{ version }} + - eccodes >=2.13.0 run: - python - {{ pin_compatible('numpy') }} - - jasper - - libpng - - libnetcdf - - hdf5 - - eccodes {{ version }} + - cffi + - attrs + - eccodes >=2.13.0 test: imports: @@ -50,6 +37,7 @@ about: license_family: Apache license_file: LICENSE summary: ECMWF ecCodes Copyright 2005-2018 ECMWF. + dev_url: https://github.com/ecmwf/eccodes-python extra: recipe-maintainers: From 6675d3f38f9dbdb864d43751497dbbcab8c0ddb2 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 06:52:25 -0500 Subject: [PATCH 09/19] Update build.sh --- recipe/build.sh | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 283cb03..885fba3 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,42 +2,4 @@ set -e -if [[ "$c_compiler" == "gcc" ]]; then - export PATH="${PATH}:${BUILD_PREFIX}/${HOST}/sysroot/usr/lib" -fi - -if [[ $(uname) == Darwin ]]; then - export LIBRARY_SEARCH_VAR=DYLD_FALLBACK_LIBRARY_PATH -elif [[ $(uname) == Linux ]]; then - export LIBRARY_SEARCH_VAR=LD_LIBRARY_PATH -fi - -export PYTHON="$PYTHON" -export PYTHON_LDFLAGS="$PREFIX/lib" -export LDFLAGS="$LDFLAGS -L$PREFIX/lib -Wl,-rpath,$PREFIX/lib" -export CFLAGS="$CFLAGS -fPIC -I$PREFIX/include" - -mkdir ../build && cd ../build -cmake -D CMAKE_INSTALL_PREFIX=$PREFIX \ - -D ENABLE_JPG=1 \ - -D ENABLE_NETCDF=1 \ - -D ENABLE_PNG=1 \ - -D ENABLE_PYTHON=1 \ - -D ENABLE_FORTRAN=0 \ - -D ENABLE_AEC=1 \ - $SRC_DIR - -make -j $CPU_COUNT - -export ECCODES_TEST_VERBOSE_OUTPUT=1 -eval ${LIBRARY_SEARCH_VAR}=$PREFIX/lib - -if [[ $(uname) == Linux ]]; then - ctest -j $CPU_COUNT -fi - -make install - -if [[ "${PY3K}" == "1" ]]; then - ${PYTHON} -m pip install eccodes-python -vv --no-deps -fi +${PYTHON} -m pip install . -vv --no-deps From 12c1554debdd460f48dc6e9ad75ed31021c02ee1 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Tue, 27 Aug 2019 11:54:05 +0000 Subject: [PATCH 10/19] MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.1, and conda-forge-pinning 2019.08.22 --- .azure-pipelines/azure-pipelines-linux.yml | 4 -- .azure-pipelines/azure-pipelines-osx.yml | 20 ++----- .ci_support/linux_python2.7.yaml | 48 ----------------- .ci_support/linux_python3.6.yaml | 34 ------------ .ci_support/linux_python3.7.yaml | 34 ------------ ...sx_fortran_compiler_version4python2.7.yaml | 52 ------------------- ...sx_fortran_compiler_version4python3.6.yaml | 52 ------------------- ...sx_fortran_compiler_version4python3.7.yaml | 52 ------------------- ...sx_fortran_compiler_version7python2.7.yaml | 52 ------------------- ...sx_fortran_compiler_version7python3.6.yaml | 52 ------------------- ...sx_fortran_compiler_version7python3.7.yaml | 52 ------------------- .ci_support/osx_python3.6.yaml | 18 +++++++ .ci_support/osx_python3.7.yaml | 18 +++++++ README.md | 43 ++------------- 14 files changed, 44 insertions(+), 487 deletions(-) delete mode 100644 .ci_support/linux_python2.7.yaml delete mode 100644 .ci_support/osx_fortran_compiler_version4python2.7.yaml delete mode 100644 .ci_support/osx_fortran_compiler_version4python3.6.yaml delete mode 100644 .ci_support/osx_fortran_compiler_version4python3.7.yaml delete mode 100644 .ci_support/osx_fortran_compiler_version7python2.7.yaml delete mode 100644 .ci_support/osx_fortran_compiler_version7python3.6.yaml delete mode 100644 .ci_support/osx_fortran_compiler_version7python3.7.yaml create mode 100644 .ci_support/osx_python3.6.yaml create mode 100644 .ci_support/osx_python3.7.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f141f95..8a14694 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,10 +10,6 @@ jobs: strategy: maxParallel: 8 matrix: - linux_python2.7: - CONFIG: linux_python2.7 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 linux_python3.6: CONFIG: linux_python3.6 UPLOAD_PACKAGES: True diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index c496b05..8e72ca2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -10,23 +10,11 @@ jobs: strategy: maxParallel: 8 matrix: - osx_fortran_compiler_version4python2.7: - CONFIG: osx_fortran_compiler_version4python2.7 + osx_python3.6: + CONFIG: osx_python3.6 UPLOAD_PACKAGES: True - osx_fortran_compiler_version4python3.6: - CONFIG: osx_fortran_compiler_version4python3.6 - UPLOAD_PACKAGES: True - osx_fortran_compiler_version4python3.7: - CONFIG: osx_fortran_compiler_version4python3.7 - UPLOAD_PACKAGES: True - osx_fortran_compiler_version7python2.7: - CONFIG: osx_fortran_compiler_version7python2.7 - UPLOAD_PACKAGES: True - osx_fortran_compiler_version7python3.6: - CONFIG: osx_fortran_compiler_version7python3.6 - UPLOAD_PACKAGES: True - osx_fortran_compiler_version7python3.7: - CONFIG: osx_fortran_compiler_version7python3.7 + osx_python3.7: + CONFIG: osx_python3.7 UPLOAD_PACKAGES: True steps: diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml deleted file mode 100644 index a78e4c0..0000000 --- a/.ci_support/linux_python2.7.yaml +++ /dev/null @@ -1,48 +0,0 @@ -boost: -- 1.70.0 -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '7' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' -numpy: -- '1.14' -perl: -- 5.26.2 -pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index eb46877..20d911b 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,46 +1,12 @@ -boost: -- 1.70.0 -c_compiler: -- gcc -c_compiler_version: -- '7' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' docker_image: - condaforge/linux-anvil-comp7 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '7' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' numpy: - '1.14' -perl: -- 5.26.2 pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml index 51bcc8c..bc1e38b 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,46 +1,12 @@ -boost: -- 1.70.0 -c_compiler: -- gcc -c_compiler_version: -- '7' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' docker_image: - condaforge/linux-anvil-comp7 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '7' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' numpy: - '1.14' -perl: -- 5.26.2 pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_fortran_compiler_version4python2.7.yaml b/.ci_support/osx_fortran_compiler_version4python2.7.yaml deleted file mode 100644 index c958b93..0000000 --- a/.ci_support/osx_fortran_compiler_version4python2.7.yaml +++ /dev/null @@ -1,52 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.70.0 -c_compiler: -- clang -c_compiler_version: -- '4' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '4' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '4' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.14' -perl: -- 5.26.2 -pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' diff --git a/.ci_support/osx_fortran_compiler_version4python3.6.yaml b/.ci_support/osx_fortran_compiler_version4python3.6.yaml deleted file mode 100644 index 54aa619..0000000 --- a/.ci_support/osx_fortran_compiler_version4python3.6.yaml +++ /dev/null @@ -1,52 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.70.0 -c_compiler: -- clang -c_compiler_version: -- '4' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '4' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '4' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.14' -perl: -- 5.26.2 -pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' diff --git a/.ci_support/osx_fortran_compiler_version4python3.7.yaml b/.ci_support/osx_fortran_compiler_version4python3.7.yaml deleted file mode 100644 index 5159bac..0000000 --- a/.ci_support/osx_fortran_compiler_version4python3.7.yaml +++ /dev/null @@ -1,52 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.70.0 -c_compiler: -- clang -c_compiler_version: -- '4' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '4' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '4' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.14' -perl: -- 5.26.2 -pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' diff --git a/.ci_support/osx_fortran_compiler_version7python2.7.yaml b/.ci_support/osx_fortran_compiler_version7python2.7.yaml deleted file mode 100644 index 7b94518..0000000 --- a/.ci_support/osx_fortran_compiler_version7python2.7.yaml +++ /dev/null @@ -1,52 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.70.0 -c_compiler: -- clang -c_compiler_version: -- '4' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '4' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '7' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.14' -perl: -- 5.26.2 -pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' diff --git a/.ci_support/osx_fortran_compiler_version7python3.6.yaml b/.ci_support/osx_fortran_compiler_version7python3.6.yaml deleted file mode 100644 index c52f48a..0000000 --- a/.ci_support/osx_fortran_compiler_version7python3.6.yaml +++ /dev/null @@ -1,52 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.70.0 -c_compiler: -- clang -c_compiler_version: -- '4' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '4' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '7' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.14' -perl: -- 5.26.2 -pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' diff --git a/.ci_support/osx_fortran_compiler_version7python3.7.yaml b/.ci_support/osx_fortran_compiler_version7python3.7.yaml deleted file mode 100644 index ce74947..0000000 --- a/.ci_support/osx_fortran_compiler_version7python3.7.yaml +++ /dev/null @@ -1,52 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.70.0 -c_compiler: -- clang -c_compiler_version: -- '4' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '4' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '7' -hdf5: -- 1.10.5 -jasper: -- 1.900.1 -libnetcdf: -- 4.6.2 -libpng: -- '1.6' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.14' -perl: -- 5.26.2 -pin_run_as_build: - boost: - max_pin: x.x.x - jasper: - max_pin: x - libnetcdf: - max_pin: x.x.x - libpng: - max_pin: x.x - perl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml new file mode 100644 index 0000000..09abb26 --- /dev/null +++ b/.ci_support/osx_python3.6.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.14' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml new file mode 100644 index 0000000..7f535c2 --- /dev/null +++ b/.ci_support/osx_python3.7.yaml @@ -0,0 +1,18 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.14' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' diff --git a/README.md b/README.md index 0bf4418..131c793 100644 --- a/README.md +++ b/README.md @@ -29,13 +29,6 @@ Current build status - - - - - - - - - - - - - - - - + - + From 0986073a1760ff77fc6c7fd7f3edf8e87f1eeca4 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 07:08:36 -0500 Subject: [PATCH 11/19] Update meta.yaml --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6b830af..a487e9a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -5,26 +5,26 @@ package: version: {{ version }} source: - url: https://pypi.io/packages/source/e/eccodes-python/eccodes-python-{{ version }}.tar.gz - sha256: 587dd828ee5e13b6a7d35a362d6fd903d914dd0422f4010af95e8f45738e9143 + url: https://github.com/ecmwf/eccodes-python/archive/{{ version }}.tar.gz + sha256: 1b228ad1589616b492a9377a68aa67ec42c1ecb681ae53d3d6ac83cb213c2c51 build: number: 0 skip: True # [win or py2k] - detect_binary_files_with_prefix: true requirements: host: - python - pip - numpy + - cffi - eccodes >=2.13.0 run: - python - {{ pin_compatible('numpy') }} - cffi - attrs - - eccodes >=2.13.0 + - {{ pin_compatible('eccodes') }} test: imports: @@ -36,7 +36,7 @@ about: license: Apache 2.0 license_family: Apache license_file: LICENSE - summary: ECMWF ecCodes Copyright 2005-2018 ECMWF. + summary: ECMWF ecCodes Copyright 2017-2019 ECMWF. dev_url: https://github.com/ecmwf/eccodes-python extra: From c58b215f92b313d0e39ec995366bd8a28ed3f471 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 07:09:19 -0500 Subject: [PATCH 12/19] Update build.sh --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index 885fba3..fc19831 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,4 +2,5 @@ set -e +${PYTHON} builder.py ${PYTHON} -m pip install . -vv --no-deps From f280ebe800ee8a69327d0b83b7952421d0f2444d Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 07:19:22 -0500 Subject: [PATCH 13/19] Update meta.yaml --- recipe/meta.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a487e9a..9a97f9e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,5 @@ {% set version = "0.9.2" %} +{% set eccodes_version = "2.13"} package: name: python-eccodes @@ -13,18 +14,20 @@ build: skip: True # [win or py2k] requirements: + build: + - {{ compiler('c') }} host: - python - pip - numpy - cffi - - eccodes >=2.13.0 + - eccodes ={{ eccodes_version }} run: - python - {{ pin_compatible('numpy') }} - cffi - attrs - - {{ pin_compatible('eccodes') }} + - eccodes ={{ eccodes_version }} test: imports: From abcbe6a38df719473a35815c3803c091db72e31f Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 07:19:42 -0500 Subject: [PATCH 14/19] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9a97f9e..1acd3d2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "0.9.2" %} -{% set eccodes_version = "2.13"} +{% set eccodes_version = "2.13" %} package: name: python-eccodes From 83cf6d0483e3dc5cd2f86f74a70a07203449843e Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Tue, 27 Aug 2019 12:20:39 +0000 Subject: [PATCH 15/19] MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.1, and conda-forge-pinning 2019.08.22 --- .ci_support/linux_python3.6.yaml | 4 ++++ .ci_support/linux_python3.7.yaml | 4 ++++ .ci_support/osx_python3.6.yaml | 4 ++++ .ci_support/osx_python3.7.yaml | 4 ++++ README.md | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index 20d911b..60773f0 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,3 +1,7 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml index bc1e38b..f7c6291 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,3 +1,7 @@ +c_compiler: +- gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml index 09abb26..a48cffa 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -1,5 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +c_compiler: +- clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml index 7f535c2..a1a1662 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -1,5 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +c_compiler: +- clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: diff --git a/README.md b/README.md index 131c793..561dbe7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Package license: Apache 2.0 Feedstock license: BSD 3-Clause -Summary: ECMWF ecCodes Copyright 2005-2018 ECMWF. +Summary: ECMWF ecCodes Copyright 2017-2019 ECMWF. From e2210df6754dcf797939009c6b4ebe82689de31d Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 07:36:44 -0500 Subject: [PATCH 16/19] Update build.sh --- recipe/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index fc19831..631828e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,5 +2,9 @@ set -e +# we need to add the compiled extension to the package +# so we mangle the MANIFEST.in +echo "recursive-include gribapi *.${SHLIB_EXT}" >> MANIFEST.in + ${PYTHON} builder.py ${PYTHON} -m pip install . -vv --no-deps From 40406b98c6c42e255e89d0f784ab100dec46167c Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 07:37:15 -0500 Subject: [PATCH 17/19] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1acd3d2..7d9a23a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,6 +33,7 @@ test: imports: - eccodes - gribapi + - gribapi._bindings about: home: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home From 7577c718f57fd196715288c4432ac32ae9e5ef27 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 08:03:28 -0500 Subject: [PATCH 18/19] Update build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 631828e..2de3ddd 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -4,7 +4,7 @@ set -e # we need to add the compiled extension to the package # so we mangle the MANIFEST.in -echo "recursive-include gribapi *.${SHLIB_EXT}" >> MANIFEST.in +echo "recursive-include gribapi *${SHLIB_EXT}" >> MANIFEST.in ${PYTHON} builder.py ${PYTHON} -m pip install . -vv --no-deps From 860f5e74e647fd3bf8bf9636eb700a5491b08dce Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Tue, 27 Aug 2019 08:16:42 -0500 Subject: [PATCH 19/19] Update build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 2de3ddd..3ff0e27 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -4,7 +4,7 @@ set -e # we need to add the compiled extension to the package # so we mangle the MANIFEST.in -echo "recursive-include gribapi *${SHLIB_EXT}" >> MANIFEST.in +echo "recursive-include gribapi *.so" >> MANIFEST.in ${PYTHON} builder.py ${PYTHON} -m pip install . -vv --no-deps
VariantStatus
linux_python2.7 - - variant - -
linux_python3.6 @@ -50,45 +43,17 @@ Current build status
osx_fortran_compiler_version4python2.7 - - variant - -
osx_fortran_compiler_version4python3.6 - - variant - -
osx_fortran_compiler_version4python3.7 - - variant - -
osx_fortran_compiler_version7python2.7 - - variant - -
osx_fortran_compiler_version7python3.6osx_python3.6 - variant + variant
osx_fortran_compiler_version7python3.7osx_python3.7 - variant + variant