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 11e11b2..0000000 Binary files a/__pycache__/build-locally.cpython-36.pyc and /dev/null differ 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() 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