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 bc6f0f8..8e72ca2 100755
--- a/.azure-pipelines/azure-pipelines-osx.yml
+++ b/.azure-pipelines/azure-pipelines-osx.yml
@@ -10,9 +10,6 @@ jobs:
strategy:
maxParallel: 8
matrix:
- osx_python2.7:
- CONFIG: osx_python2.7
- UPLOAD_PACKAGES: True
osx_python3.6:
CONFIG: osx_python3.6
UPLOAD_PACKAGES: True
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
deleted file mode 100644
index eff34be..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.35
-numpy:
-- '1.14'
-perl:
-- '5.26'
-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 f2a2efc..60773f0 100644
--- a/.ci_support/linux_python3.6.yaml
+++ b/.ci_support/linux_python3.6.yaml
@@ -1,5 +1,3 @@
-boost:
-- 1.70.0
c_compiler:
- gcc
c_compiler_version:
@@ -8,39 +6,11 @@ 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.35
numpy:
- '1.14'
-perl:
-- '5.26'
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 9ce541c..f7c6291 100644
--- a/.ci_support/linux_python3.7.yaml
+++ b/.ci_support/linux_python3.7.yaml
@@ -1,5 +1,3 @@
-boost:
-- 1.70.0
c_compiler:
- gcc
c_compiler_version:
@@ -8,39 +6,11 @@ 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.35
numpy:
- '1.14'
-perl:
-- '5.26'
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_python2.7.yaml b/.ci_support/osx_python2.7.yaml
deleted file mode 100644
index 14273f2..0000000
--- a/.ci_support/osx_python2.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.35
-macos_machine:
-- x86_64-apple-darwin13.4.0
-macos_min_version:
-- '10.9'
-numpy:
-- '1.14'
-perl:
-- '5.26'
-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_python3.6.yaml b/.ci_support/osx_python3.6.yaml
index a0f3555..a48cffa 100644
--- a/.ci_support/osx_python3.6.yaml
+++ b/.ci_support/osx_python3.6.yaml
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
-boost:
-- 1.70.0
c_compiler:
- clang
c_compiler_version:
@@ -10,41 +8,13 @@ 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.35
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
numpy:
- '1.14'
-perl:
-- '5.26'
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_python3.7.yaml b/.ci_support/osx_python3.7.yaml
index 26918a7..a1a1662 100644
--- a/.ci_support/osx_python3.7.yaml
+++ b/.ci_support/osx_python3.7.yaml
@@ -1,7 +1,5 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
-boost:
-- 1.70.0
c_compiler:
- clang
c_compiler_version:
@@ -10,41 +8,13 @@ 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.35
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.9'
numpy:
- '1.14'
-perl:
-- '5.26'
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/.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
):
-
-Details about conda
and system ( conda info
):
-@
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..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.
@@ -29,13 +29,6 @@ Current build status
Variant | Status |
---|---|
linux_python2.7 | -- - - - | -
linux_python3.6 | @@ -49,13 +42,6 @@ Current build status | -
osx_python2.7 | -- - - - |
osx_python3.6 | 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/build.sh b/recipe/build.sh index a8ec16c..3ff0e27 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -2,38 +2,9 @@ set -e -if [[ "$c_compiler" == "gcc" ]]; then - export PATH="${PATH}:${BUILD_PREFIX}/${HOST}/sysroot/usr/lib" -fi +# we need to add the compiled extension to the package +# so we mangle the MANIFEST.in +echo "recursive-include gribapi *.so" >> MANIFEST.in -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 +${PYTHON} builder.py +${PYTHON} -m pip install . -vv --no-deps diff --git a/recipe/meta.yaml b/recipe/meta.yaml index fcf2337..7d9a23a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,53 +1,47 @@ -{% set version = "2.12.3" %} +{% set version = "0.9.2" %} +{% set eccodes_version = "2.13" %} package: name: python-eccodes version: {{ version }} source: - url: https://confluence.ecmwf.int/download/attachments/131371724/eccodes-{{ version }}-Source.tar.gz - sha256: 6dafe2fe3a9994ab2359f8bf8f6bad04dc4f936918999cf01e026323882b6b77 + url: https://github.com/ecmwf/eccodes-python/archive/{{ version }}.tar.gz + sha256: 1b228ad1589616b492a9377a68aa67ec42c1ecb681ae53d3d6ac83cb213c2c51 build: - number: 1003 - skip: True # [win] - detect_binary_files_with_prefix: true + number: 0 + skip: True # [win or py2k] requirements: build: - - cmake - - perl - - {{ compiler('fortran') }} - {{ compiler('c') }} - - {{ compiler('cxx') }} host: - python + - pip - numpy - - boost - - jasper - - libpng - - libnetcdf - - hdf5 - - eccodes {{ version }} + - cffi + - eccodes ={{ eccodes_version }} run: - python - {{ pin_compatible('numpy') }} - - jasper - - libpng - - libnetcdf - - hdf5 - - eccodes {{ version }} + - cffi + - attrs + - eccodes ={{ eccodes_version }} test: imports: - eccodes - gribapi + - gribapi._bindings about: home: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home license: Apache 2.0 license_family: Apache - summary: ECMWF ecCodes Copyright 2005-2018 ECMWF. + license_file: LICENSE + summary: ECMWF ecCodes Copyright 2017-2019 ECMWF. + dev_url: https://github.com/ecmwf/eccodes-python extra: recipe-maintainers: |