From d3601e47709ca686c2e16587cf7271782ee70056 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Oct 2018 09:48:13 -0500 Subject: [PATCH 01/56] remove conda-forge from hi-rest install instructions --- recipe/basemap-1.0.8dev-datadir.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/basemap-1.0.8dev-datadir.patch b/recipe/basemap-1.0.8dev-datadir.patch index 1bd6c58..bb55828 100644 --- a/recipe/basemap-1.0.8dev-datadir.patch +++ b/recipe/basemap-1.0.8dev-datadir.patch @@ -26,7 +26,7 @@ + If you are requesting an, 'intermediate', 'high' or 'full' + resolution dataset, you may need to download and install those + files separately with -+ `conda install -c conda-forge basemap-data-hires`.""") ++ `conda install basemap-data-hires`.""") # only gshhs coastlines can be polygons. if name != 'gshhs': as_polygons=False try: @@ -38,7 +38,7 @@ gis_file = os.path.join(basemap_datadir,'UScounties') + if not os.path.isfile(gis_file + '.shp'): + msg = ('Cannot find {}.shp\nYou can install it with' -+ '`conda install -c conda-forge basemap-data-hires`').format ++ '`conda install basemap-data-hires`').format + raise IOError(msg(gis_file)) + ax = ax or self._check_ax() county_info = self.readshapefile(gis_file,'counties',\ From e04b3fd591799e8192e8dcdede9960e0e65c3874 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Oct 2018 09:48:28 -0500 Subject: [PATCH 02/56] enable windows py27 build --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1d84a0c..692548b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,6 @@ source: build: number: 0 - skip: True # [win and py2k] requirements: build: From a008555d5dafb30e2dada9ad132fa8c7facd6985 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Oct 2018 09:48:40 -0500 Subject: [PATCH 03/56] add descriptions to about section --- recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 692548b..9e42d28 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -46,6 +46,11 @@ about: license: MIT license_file: README.md summary: 'Plot on map projections using matplotlib' + description: | + Basemap toolkit is a library for plotting 2D data on maps in Python. + It is similar in functionality to the matlab mapping toolbox, the IDL mapping facilities, GrADS, or the Generic Mapping Tools. + doc_url: http://matplotlib.org/basemap/ + doc_source_url: https://github.com/matplotlib/basemap/blob/master/doc/index.rst extra: recipe-maintainers: From d6f2b8e03e8ddcd213f2227e3aaf99963c0b6cc7 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Oct 2018 09:49:41 -0500 Subject: [PATCH 04/56] remote --no-cache-dir --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index d5cf92d..2b47866 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -7,7 +7,7 @@ cythonize --force src/_geoslib.pyx export GEOS_DIR=$PREFIX -$PYTHON -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv +$PYTHON -m pip install . --no-deps --ignore-installed -vvv # Remove the data from the site-packages directory. rm -rf $SP_DIR/mpl_toolkits/basemap/data From ee1455cdb540f9ddcbf1cff60b2769fff2b7fc43 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 10 Oct 2018 09:49:50 -0500 Subject: [PATCH 05/56] use setuptools for install on windows --- recipe/bld.bat | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 05f1d43..f2b99ea 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -4,7 +4,9 @@ rmdir %SRC_DIR%\geos-3.3.3 /s /q || exit 1 del src/_geoslib.c cythonize --force src/_geoslib.pyx -"%PYTHON%" -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv +:: Installing via pip has some issues, use setuptools +:: "%PYTHON%" -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv +%PYTHON% setup.py install --single-version-externally-managed --record=record.txt if errorlevel 1 exit 1 :: Remove the data from the site-packages directory. From e2aa5c2730cdda0e81ed384389aa9a920e5bf893 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Tue, 30 Oct 2018 01:15:26 +0000 Subject: [PATCH 06/56] bump build number --- conda-forge.yml | 10 +++++----- recipe/meta.yaml | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index e585c95..cd82191 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,7 @@ -travis: - secure: - BINSTAR_TOKEN: ESHO3IQAsYAgHAS74dh4iC9L2kXKYQhj2K0i8O4axmrTdFf6vNrxf+Fnfb9U56k63qu+o5vBH66Kp2CR9T6eaH2Wg0KwOuKVSPiwmdc17QA/JGsgBldc4fiammT27pLRjgy+ewfNnxUMIlccMKXqVbTO6z+6pkzfJcr4gWlUjAN46eOWCcYZ2RiUdVCsUgZytEU7+EEO+optlp22h1ADNN8QBpVJ3MdK/G57P/VzBa+79ZTRfQUKzW9Vv4ub+T4AszRIprorx/ulL/XxgmN0qtEcSClBYdrMKl/3nZ5rK9jtqVkMLyCXhUV0oUoZMZ9M8VTRpM+ya99iHGEg2EazDmf4rI/H6TFKJtgRlVLz427EPnwq4JtNaozonsPizdHNu7JAY/rWf/h61aW3i3B/tqGW+RiuWKfsK7yBqgmPv/gHAzTSlD0yQEAXlirHEUJzrg/tbCB/5xxXKYjZZaFdDJZVHzeaULbW/MVVjOWdff1B7T+zyzbBj5xIymmqzYAaahFJDSLVxREwLH1hGJS2jMzwmlCFNZw8rRkv4hlC2OylyGWlogOQEgjqTRLJdE2pG+6sAQNKC3zswNNGGMUkOWUaVOrI4k/5nK6miJSQyUzXzGAhbZmX4f0YgOy3oI1KZ5f1Y0UxhMiC7GCRm6ROeDkEkYc4T1QQGUVxZ27U0SM= appveyor: - secure: - BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 + secure: {BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1} +compiler_stack: comp7 max_py_ver: '37' +max_r_ver: '35' +travis: + secure: {BINSTAR_TOKEN: ESHO3IQAsYAgHAS74dh4iC9L2kXKYQhj2K0i8O4axmrTdFf6vNrxf+Fnfb9U56k63qu+o5vBH66Kp2CR9T6eaH2Wg0KwOuKVSPiwmdc17QA/JGsgBldc4fiammT27pLRjgy+ewfNnxUMIlccMKXqVbTO6z+6pkzfJcr4gWlUjAN46eOWCcYZ2RiUdVCsUgZytEU7+EEO+optlp22h1ADNN8QBpVJ3MdK/G57P/VzBa+79ZTRfQUKzW9Vv4ub+T4AszRIprorx/ulL/XxgmN0qtEcSClBYdrMKl/3nZ5rK9jtqVkMLyCXhUV0oUoZMZ9M8VTRpM+ya99iHGEg2EazDmf4rI/H6TFKJtgRlVLz427EPnwq4JtNaozonsPizdHNu7JAY/rWf/h61aW3i3B/tqGW+RiuWKfsK7yBqgmPv/gHAzTSlD0yQEAXlirHEUJzrg/tbCB/5xxXKYjZZaFdDJZVHzeaULbW/MVVjOWdff1B7T+zyzbBj5xIymmqzYAaahFJDSLVxREwLH1hGJS2jMzwmlCFNZw8rRkv4hlC2OylyGWlogOQEgjqTRLJdE2pG+6sAQNKC3zswNNGGMUkOWUaVOrI4k/5nK6miJSQyUzXzGAhbZmX4f0YgOy3oI1KZ5f1Y0UxhMiC7GCRm6ROeDkEkYc4T1QQGUVxZ27U0SM=} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9e42d28..07553a6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,8 @@ source: - use_proj_data.patch build: - number: 0 + number: 1000 + skip: True # [win and py2k] requirements: build: From df1c7ded72d5a64081498c5da37437e49af80843 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Tue, 30 Oct 2018 01:15:31 +0000 Subject: [PATCH 07/56] MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.16 --- .appveyor.yml | 3 - ...c_compilergcccxx_compilergxxpython2.7.yaml | 31 ++++++++++ ...c_compilergcccxx_compilergxxpython3.6.yaml | 31 ++++++++++ ...c_compilergcccxx_compilergxxpython3.7.yaml | 31 ++++++++++ ..._ccxx_compilertoolchain_cxxpython2.7.yaml} | 9 +++ ..._ccxx_compilertoolchain_cxxpython3.6.yaml} | 9 +++ ..._ccxx_compilertoolchain_cxxpython3.7.yaml} | 9 +++ .ci_support/linux_python3.5.yaml | 22 ------- ...lerclangcxx_compilerclangxxpython2.7.yaml} | 18 ++++-- ...ilerclangcxx_compilerclangxxpython3.6.yaml | 34 +++++++++++ ...ilerclangcxx_compilerclangxxpython3.7.yaml | 34 +++++++++++ ..._ccxx_compilertoolchain_cxxpython2.7.yaml} | 8 +++ ..._ccxx_compilertoolchain_cxxpython3.6.yaml} | 8 +++ ..._ccxx_compilertoolchain_cxxpython3.7.yaml} | 8 +++ ...ilervs2015cxx_compilervs2015python3.5.yaml | 24 -------- ...ilervs2015cxx_compilervs2015python3.6.yaml | 2 +- ...ilervs2015cxx_compilervs2015python3.7.yaml | 2 +- .circleci/config.yml | 60 +++++++++++++++---- .travis.yml | 10 ++-- 19 files changed, 281 insertions(+), 72 deletions(-) create mode 100644 .ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml create mode 100644 .ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml create mode 100644 .ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml rename .ci_support/{linux_python2.7.yaml => linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml} (65%) rename .ci_support/{linux_python3.6.yaml => linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml} (65%) rename .ci_support/{linux_python3.7.yaml => linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml} (65%) delete mode 100644 .ci_support/linux_python3.5.yaml rename .ci_support/{osx_python3.5.yaml => osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml} (57%) create mode 100644 .ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml create mode 100644 .ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml rename .ci_support/{osx_python2.7.yaml => osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml} (72%) rename .ci_support/{osx_python3.6.yaml => osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml} (72%) rename .ci_support/{osx_python3.7.yaml => osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml} (72%) delete mode 100644 .ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml diff --git a/.appveyor.yml b/.appveyor.yml index 4df7bce..c3f7178 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,9 +9,6 @@ environment: secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 matrix: - - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.5 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml b/.ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml new file mode 100644 index 0000000..202e711 --- /dev/null +++ b/.ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml @@ -0,0 +1,31 @@ +build_number_decrement: +- '0' +c_compiler: +- gcc +channel_sources: +- conda-forge/label/gcc7,defaults +channel_targets: +- conda-forge gcc7 +cxx_compiler: +- gxx +docker_image: +- condaforge/linux-anvil-comp7 +geos: +- 3.6.2 +numpy: +- '1.9' +pin_run_as_build: + geos: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - docker_image + - build_number_decrement diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml b/.ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml new file mode 100644 index 0000000..b2b2301 --- /dev/null +++ b/.ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml @@ -0,0 +1,31 @@ +build_number_decrement: +- '0' +c_compiler: +- gcc +channel_sources: +- conda-forge/label/gcc7,defaults +channel_targets: +- conda-forge gcc7 +cxx_compiler: +- gxx +docker_image: +- condaforge/linux-anvil-comp7 +geos: +- 3.6.2 +numpy: +- '1.9' +pin_run_as_build: + geos: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - docker_image + - build_number_decrement diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml b/.ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml new file mode 100644 index 0000000..5277431 --- /dev/null +++ b/.ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml @@ -0,0 +1,31 @@ +build_number_decrement: +- '0' +c_compiler: +- gcc +channel_sources: +- conda-forge/label/gcc7,defaults +channel_targets: +- conda-forge gcc7 +cxx_compiler: +- gxx +docker_image: +- condaforge/linux-anvil-comp7 +geos: +- 3.6.2 +numpy: +- '1.9' +pin_run_as_build: + geos: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - docker_image + - build_number_decrement diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml similarity index 65% rename from .ci_support/linux_python2.7.yaml rename to .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml index fe2e2c5..db1c969 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml @@ -1,3 +1,5 @@ +build_number_decrement: +- '1000' c_compiler: - toolchain_c channel_sources: @@ -20,3 +22,10 @@ pin_run_as_build: max_pin: x.x python: - '2.7' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - docker_image + - build_number_decrement diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml similarity index 65% rename from .ci_support/linux_python3.6.yaml rename to .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml index d4ebe6b..a26e686 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml @@ -1,3 +1,5 @@ +build_number_decrement: +- '1000' c_compiler: - toolchain_c channel_sources: @@ -20,3 +22,10 @@ pin_run_as_build: max_pin: x.x python: - '3.6' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - docker_image + - build_number_decrement diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml similarity index 65% rename from .ci_support/linux_python3.7.yaml rename to .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml index 7f0f77a..679e982 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml @@ -1,3 +1,5 @@ +build_number_decrement: +- '1000' c_compiler: - toolchain_c channel_sources: @@ -20,3 +22,10 @@ pin_run_as_build: max_pin: x.x python: - '3.7' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - docker_image + - build_number_decrement diff --git a/.ci_support/linux_python3.5.yaml b/.ci_support/linux_python3.5.yaml deleted file mode 100644 index c2f9c3c..0000000 --- a/.ci_support/linux_python3.5.yaml +++ /dev/null @@ -1,22 +0,0 @@ -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- toolchain_cxx -docker_image: -- condaforge/linux-anvil -geos: -- 3.6.2 -numpy: -- '1.9' -pin_run_as_build: - geos: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.5' diff --git a/.ci_support/osx_python3.5.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml similarity index 57% rename from .ci_support/osx_python3.5.yaml rename to .ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml index 280d712..b7d0d58 100644 --- a/.ci_support/osx_python3.5.yaml +++ b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml @@ -1,13 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +build_number_decrement: +- '0' c_compiler: -- toolchain_c +- clang channel_sources: -- conda-forge,defaults +- conda-forge/label/gcc7,defaults channel_targets: -- conda-forge main +- conda-forge gcc7 cxx_compiler: -- toolchain_cxx +- clangxx geos: - 3.6.2 macos_machine: @@ -23,4 +25,10 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.5' +- '2.7' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml new file mode 100644 index 0000000..5e7a8a6 --- /dev/null +++ b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml @@ -0,0 +1,34 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +build_number_decrement: +- '0' +c_compiler: +- clang +channel_sources: +- conda-forge/label/gcc7,defaults +channel_targets: +- conda-forge gcc7 +cxx_compiler: +- clangxx +geos: +- 3.6.2 +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.9' +pin_run_as_build: + geos: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml new file mode 100644 index 0000000..588c5ef --- /dev/null +++ b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml @@ -0,0 +1,34 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +build_number_decrement: +- '0' +c_compiler: +- clang +channel_sources: +- conda-forge/label/gcc7,defaults +channel_targets: +- conda-forge gcc7 +cxx_compiler: +- clangxx +geos: +- 3.6.2 +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.9' +numpy: +- '1.9' +pin_run_as_build: + geos: + max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x +python: +- '3.7' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - build_number_decrement diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml similarity index 72% rename from .ci_support/osx_python2.7.yaml rename to .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml index 8364686..55edae9 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +build_number_decrement: +- '1000' c_compiler: - toolchain_c channel_sources: @@ -24,3 +26,9 @@ pin_run_as_build: max_pin: x.x python: - '2.7' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - build_number_decrement diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml similarity index 72% rename from .ci_support/osx_python3.6.yaml rename to .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml index 4854bac..2020efb 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +build_number_decrement: +- '1000' c_compiler: - toolchain_c channel_sources: @@ -24,3 +26,9 @@ pin_run_as_build: max_pin: x.x python: - '3.6' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - build_number_decrement diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml similarity index 72% rename from .ci_support/osx_python3.7.yaml rename to .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml index 44a3496..47b01f7 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +build_number_decrement: +- '1000' c_compiler: - toolchain_c channel_sources: @@ -24,3 +26,9 @@ pin_run_as_build: max_pin: x.x python: - '3.7' +zip_keys: +- - c_compiler + - cxx_compiler + - channel_sources + - channel_targets + - build_number_decrement diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml deleted file mode 100644 index 69f70de..0000000 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml +++ /dev/null @@ -1,24 +0,0 @@ -c_compiler: -- vs2015 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- vs2015 -geos: -- 3.6.2 -numpy: -- '1.14' -pin_run_as_build: - geos: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.5' -zip_keys: -- - python - - c_compiler - - cxx_compiler diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml index 3ba9815..e76d321 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml @@ -9,7 +9,7 @@ cxx_compiler: geos: - 3.6.2 numpy: -- '1.14' +- '1.11' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml index eb4f506..b38a96c 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml @@ -9,7 +9,7 @@ cxx_compiler: geos: - 3.6.2 numpy: -- '1.14' +- '1.11' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.circleci/config.yml b/.circleci/config.yml index 0047203..471da52 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,11 +1,11 @@ version: 2 jobs: - build_linux_python2.7: + build_linux_c_compilergcccxx_compilergxxpython2.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_python2.7" + - CONFIG: "linux_c_compilergcccxx_compilergxxpython2.7" steps: - checkout - run: @@ -18,11 +18,11 @@ jobs: - run: # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. command: ./.circleci/run_docker_build.sh - build_linux_python3.5: + build_linux_c_compilergcccxx_compilergxxpython3.6: working_directory: ~/test machine: true environment: - - CONFIG: "linux_python3.5" + - CONFIG: "linux_c_compilergcccxx_compilergxxpython3.6" steps: - checkout - run: @@ -35,11 +35,11 @@ jobs: - run: # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. command: ./.circleci/run_docker_build.sh - build_linux_python3.6: + build_linux_c_compilergcccxx_compilergxxpython3.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_python3.6" + - CONFIG: "linux_c_compilergcccxx_compilergxxpython3.7" steps: - checkout - run: @@ -52,11 +52,45 @@ jobs: - run: # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. command: ./.circleci/run_docker_build.sh - build_linux_python3.7: + build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_python3.7" + - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7" + steps: + - checkout + - run: + name: Fast finish outdated PRs and merge PRs + command: | + ./.circleci/fast_finish_ci_pr_build.sh + ./.circleci/checkout_merge_commit.sh + - run: + command: docker pull condaforge/linux-anvil + - run: + # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. + command: ./.circleci/run_docker_build.sh + build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6: + working_directory: ~/test + machine: true + environment: + - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6" + steps: + - checkout + - run: + name: Fast finish outdated PRs and merge PRs + command: | + ./.circleci/fast_finish_ci_pr_build.sh + ./.circleci/checkout_merge_commit.sh + - run: + command: docker pull condaforge/linux-anvil + - run: + # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. + command: ./.circleci/run_docker_build.sh + build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7: + working_directory: ~/test + machine: true + environment: + - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7" steps: - checkout - run: @@ -74,7 +108,9 @@ workflows: version: 2 build_and_test: jobs: - - build_linux_python2.7 - - build_linux_python3.5 - - build_linux_python3.6 - - build_linux_python3.7 + - build_linux_c_compilergcccxx_compilergxxpython2.7 + - build_linux_c_compilergcccxx_compilergxxpython3.6 + - build_linux_c_compilergcccxx_compilergxxpython3.7 + - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7 + - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6 + - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7 diff --git a/.travis.yml b/.travis.yml index eef5261..d835b9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,12 @@ osx_image: xcode6.4 env: matrix: - - CONFIG=osx_python2.7 - - CONFIG=osx_python3.5 - - CONFIG=osx_python3.6 - - CONFIG=osx_python3.7 + - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython2.7 + - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython3.6 + - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython3.7 + - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7 + - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6 + - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. From 7397d94b5cbd6e0d8f2a6ed8c73d0d4d7a719637 Mon Sep 17 00:00:00 2001 From: Filipe Date: Mon, 29 Oct 2018 22:57:50 -0300 Subject: [PATCH 08/56] Update meta.yaml --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 07553a6..8fc1894 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,8 @@ requirements: - python - pip - cython - - numpy + - numpy # [not win] + - numpy 1.14.* # [win] - geos - matplotlib >=1.0.0 - pyproj >=1.9.3 From bde86a25e31aa66f91ad1c01408675c7ea6d108b Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Tue, 30 Oct 2018 01:58:41 +0000 Subject: [PATCH 09/56] MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.16 --- .../win_c_compilervs2015cxx_compilervs2015python3.6.yaml | 2 -- .../win_c_compilervs2015cxx_compilervs2015python3.7.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml index e76d321..1ff6675 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml @@ -8,8 +8,6 @@ cxx_compiler: - vs2015 geos: - 3.6.2 -numpy: -- '1.11' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml index b38a96c..9be79ae 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml @@ -8,8 +8,6 @@ cxx_compiler: - vs2015 geos: - 3.6.2 -numpy: -- '1.11' pin_run_as_build: geos: max_pin: x.x.x From ca37f851bebc51ee17d1a3c06d05a1fc5bf1845b Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 20 Jan 2019 00:38:29 +0000 Subject: [PATCH 10/56] MNT: Re-rendered with conda-build 3.17.5, conda-smithy 3.2.9, and conda-forge-pinning 2019.01.18 --- .appveyor.yml | 17 ++-- .azure-pipelines/azure-pipelines-linux.yml | 37 +++++++ .azure-pipelines/azure-pipelines-osx.yml | 90 +++++++++++++++++ .azure-pipelines/azure-pipelines-win.yml | 96 +++++++++++++++++++ .azure-pipelines/build_steps.sh | 38 ++++++++ .azure-pipelines/run_docker_build.sh | 57 +++++++++++ ...n_ccxx_compilertoolchain_cxxpython2.7.yaml | 31 ------ ...n_ccxx_compilertoolchain_cxxpython3.6.yaml | 31 ------ ...n_ccxx_compilertoolchain_cxxpython3.7.yaml | 31 ------ ...gxxpython2.7.yaml => linux_python2.7.yaml} | 15 +-- ...gxxpython3.6.yaml => linux_python3.6.yaml} | 15 +-- ...gxxpython3.7.yaml => linux_python3.7.yaml} | 15 +-- ...ilerclangcxx_compilerclangxxpython2.7.yaml | 34 ------- ...ilerclangcxx_compilerclangxxpython3.6.yaml | 34 ------- ...ilerclangcxx_compilerclangxxpython3.7.yaml | 34 ------- ...n_cxxpython2.7.yaml => osx_python2.7.yaml} | 14 +-- ...n_cxxpython3.6.yaml => osx_python3.6.yaml} | 14 +-- ...n_cxxpython3.7.yaml => osx_python3.7.yaml} | 14 +-- ...ilervs2015cxx_compilervs2015python3.6.yaml | 2 +- ...ilervs2015cxx_compilervs2015python3.7.yaml | 2 +- .circleci/build_steps.sh | 11 +-- .circleci/config.yml | 82 ++++------------ .circleci/fast_finish_ci_pr_build.sh | 2 +- .circleci/run_docker_build.sh | 17 +++- .travis.yml | 21 ++-- README.md | 12 +++ azure-pipelines.yml | 8 ++ 27 files changed, 409 insertions(+), 365 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-linux.yml create mode 100755 .azure-pipelines/azure-pipelines-osx.yml create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100755 .azure-pipelines/build_steps.sh create mode 100755 .azure-pipelines/run_docker_build.sh delete mode 100644 .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml delete mode 100644 .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml delete mode 100644 .ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml rename .ci_support/{linux_c_compilergcccxx_compilergxxpython2.7.yaml => linux_python2.7.yaml} (52%) rename .ci_support/{linux_c_compilergcccxx_compilergxxpython3.6.yaml => linux_python3.6.yaml} (52%) rename .ci_support/{linux_c_compilergcccxx_compilergxxpython3.7.yaml => linux_python3.7.yaml} (52%) delete mode 100644 .ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml delete mode 100644 .ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml delete mode 100644 .ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml rename .ci_support/{osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml => osx_python2.7.yaml} (64%) rename .ci_support/{osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml => osx_python3.6.yaml} (64%) rename .ci_support/{osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml => osx_python3.7.yaml} (64%) create mode 100644 azure-pipelines.yml diff --git a/.appveyor.yml b/.appveyor.yml index c3f7178..4a085b9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,6 +1,7 @@ # This file was automatically generated by conda-smithy. To update a component of this # file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run # "conda smithy rerender". +# -*- mode: yaml -*- environment: @@ -24,11 +25,11 @@ platform: install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" + powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py - # Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - cmd: rmdir C:\cygwin /s /q # Add path, activate `conda` and update conda. @@ -37,20 +38,16 @@ install: - cmd: set PYTHONUNBUFFERED=1 - # Add our channels. - - cmd: conda.exe config --set show_channel_urls true - - cmd: conda.exe config --remove channels defaults - - cmd: conda.exe config --add channels defaults - - cmd: conda.exe config --add channels conda-forge - # Configure the VM. - - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=2 + # Tell conda we want an updated version of conda-forge-ci-setup and conda-build + - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build + - cmd: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - cmd: run_conda_forge_build_setup # Skip .NET project specific build phase. build: off test_script: - - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + - conda.exe build recipe -m .ci_support\%CONFIG%.yaml deploy_script: - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml new file mode 100755 index 0000000..eb9811e --- /dev/null +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -0,0 +1,37 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: linux_64 + pool: + vmImage: ubuntu-16.04 + timeoutInMinutes: 240 + strategy: + maxParallel: 8 + matrix: + linux_python2.7: + CONFIG: linux_python2.7 + UPLOAD_PACKAGES: False + linux_python3.6: + CONFIG: linux_python3.6 + UPLOAD_PACKAGES: False + linux_python3.7: + CONFIG: linux_python3.7 + UPLOAD_PACKAGES: False + steps: + - script: | + sudo pip install --upgrade pip + sudo pip install setuptools shyaml + displayName: Install dependencies + + # configure qemu binfmt-misc running. This allows us to run docker containers + # embedded qemu-static + - script: | + docker run --rm --privileged multiarch/qemu-user-static:register + ls /proc/sys/fs/binfmt_misc/ + condition: not(startsWith(variables['CONFIG'], 'linux_64')) + displayName: Configure binfmt_misc + + - script: .azure-pipelines/run_docker_build.sh + displayName: Run docker build \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml new file mode 100755 index 0000000..756bdbb --- /dev/null +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -0,0 +1,90 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: osx_64 + pool: + vmImage: macOS-10.13 + timeoutInMinutes: 240 + strategy: + maxParallel: 8 + matrix: + osx_python2.7: + CONFIG: osx_python2.7 + UPLOAD_PACKAGES: False + osx_python3.6: + CONFIG: osx_python3.6 + UPLOAD_PACKAGES: False + osx_python3.7: + CONFIG: osx_python3.7 + UPLOAD_PACKAGES: False + + steps: + # TODO: Fast finish on azure pipelines? + - script: | + echo "Fast Finish" + + + - script: | + echo "Removing homebrew from Azure to avoid conflicts." + curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew + chmod +x ~/uninstall_homebrew + ~/uninstall_homebrew -fq + rm ~/uninstall_homebrew + displayName: Remove homebrew + + - script: | + echo "Installing Miniconda" + set -x -e + curl -o $(Build.StagingDirectory)/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh + chmod +x $(Build.StagingDirectory)/miniconda.sh + $(Build.StagingDirectory)/miniconda.sh -b -p $(Build.StagingDirectory)/miniconda + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + echo "Setting up Conda environment" + displayName: 'Install miniconda' + + - script: | + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + set -x -e + conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build + displayName: 'Add conda-forge-ci-setup=2' + + - script: | + set -x -e + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + echo "Configuring conda." + + setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml + + source run_conda_forge_build_setup + conda update --yes --quiet --override-channels -c conda-forge -c defaults --all + env: { + OSX_FORCE_SDK_DOWNLOAD: "1" + } + displayName: Configure conda and conda-build + + - script: | + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + set -x -e + mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml + displayName: Mangle compiler + + - script: | + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + set -x -e + make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml + displayName: Generate build number clobber file + + - script: | + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + set -x -e + conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + displayName: Build recipe + + - script: | + export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + set -x -e + upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + displayName: Upload recipe + condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 0000000..3ac1bb4 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,96 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win_64 + pool: + vmImage: vs2017-win2016 + timeoutInMinutes: 240 + strategy: + maxParallel: 4 + matrix: + win_c_compilervs2015cxx_compilervs2015python3.6: + CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6 + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False + win_c_compilervs2015cxx_compilervs2015python3.7: + CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7 + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_PACKAGES: False + steps: + # TODO: Fast finish on azure pipelines? + - script: | + ECHO ON + + + - script: | + choco install vcpython27 -fdv -y --debug + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Install vcpython27.msi (if needed) + + # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) + # - script: rmdir C:\cygwin /s /q + # continueOnError: true + + - powershell: | + Set-PSDebug -Trace 1 + + $batchcontent = @" + ECHO ON + SET vcpython=C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0 + + DIR "%vcpython%" + + CALL "%vcpython%\vcvarsall.bat" %* + "@ + + $batchDir = "C:\Program Files (x86)\Common Files\Microsoft\Visual C++ for Python\9.0\VC" + $batchPath = "$batchDir" + "\vcvarsall.bat" + New-Item -Path $batchPath -ItemType "file" -Force + + Set-Content -Value $batchcontent -Path $batchPath + + Get-ChildItem -Path $batchDir + + Get-ChildItem -Path ($batchDir + '\..') + + condition: contains(variables['CONFIG'], 'vs2008') + displayName: Patch vs2008 (if needed) + + - task: CondaEnvironment@1 + inputs: + packageSpecs: 'python=3.6 conda-build conda conda-forge::conda-forge-ci-setup=2' # Optional + installOptions: "-c conda-forge" + updateConda: false + displayName: Install conda-build and activate environment + + - script: set PYTHONUNBUFFERED=1 + + # Configure the VM + - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml + + # Configure the VM. + - script: | + run_conda_forge_build_setup + + displayName: conda-forge build setup + + + # Special cased version setting some more things! + - script: | + conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + displayName: Build recipe (vs2008) + env: { + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin", + } + condition: contains(variables['CONFIG'], 'vs2008') + + - script: | + conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + displayName: Build recipe + condition: not(contains(variables['CONFIG'], 'vs2008')) + + - script: | + upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) diff --git a/.azure-pipelines/build_steps.sh b/.azure-pipelines/build_steps.sh new file mode 100755 index 0000000..779d52b --- /dev/null +++ b/.azure-pipelines/build_steps.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +# benefit from the improvement. + +set -xeuo pipefail +export PYTHONUNBUFFERED=1 +export FEEDSTOCK_ROOT=/home/conda/feedstock_root +export RECIPE_ROOT=/home/conda/recipe_root +export CI_SUPPORT=/home/conda/feedstock_root/.ci_support +export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" + +cat >~/.condarc </dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" + +FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" + +docker info + +# In order for the conda-build process in the container to write to the mounted +# volumes, we need to run with the same id as the host machine, which is +# normally the owner of the mounted volumes, or at least has write permission +export HOST_USER_ID=$(id -u) +# Check if docker-machine is being used (normally on OSX) and get the uid from +# the VM +if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then + export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) +fi + +ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" + +if [ -z "$CONFIG" ]; then + echo "Need to set CONFIG env variable" + exit 1 +fi + +pip install shyaml +DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) + +mkdir -p "$ARTIFACTS" +DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" +rm -f "$DONE_CANARY" +# Not all providers run with a real tty. Disable using one +DOCKER_RUN_ARGS=" " + +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -e CONFIG \ + -e BINSTAR_TOKEN \ + -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ + $DOCKER_IMAGE \ + bash \ + /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + +# verify that the end of the script was reached +test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml deleted file mode 100644 index db1c969..0000000 --- a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml +++ /dev/null @@ -1,31 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- toolchain_cxx -docker_image: -- condaforge/linux-anvil -geos: -- 3.6.2 -numpy: -- '1.9' -pin_run_as_build: - geos: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml deleted file mode 100644 index a26e686..0000000 --- a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml +++ /dev/null @@ -1,31 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- toolchain_cxx -docker_image: -- condaforge/linux-anvil -geos: -- 3.6.2 -numpy: -- '1.9' -pin_run_as_build: - geos: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml b/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml deleted file mode 100644 index 679e982..0000000 --- a/.ci_support/linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml +++ /dev/null @@ -1,31 +0,0 @@ -build_number_decrement: -- '1000' -c_compiler: -- toolchain_c -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- toolchain_cxx -docker_image: -- condaforge/linux-anvil -geos: -- 3.6.2 -numpy: -- '1.9' -pin_run_as_build: - geos: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml b/.ci_support/linux_python2.7.yaml similarity index 52% rename from .ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml rename to .ci_support/linux_python2.7.yaml index 202e711..f3d6b8f 100644 --- a/.ci_support/linux_c_compilergcccxx_compilergxxpython2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -1,17 +1,15 @@ -build_number_decrement: -- '0' c_compiler: - gcc channel_sources: -- conda-forge/label/gcc7,defaults +- conda-forge,defaults channel_targets: -- conda-forge gcc7 +- conda-forge main cxx_compiler: - gxx docker_image: - condaforge/linux-anvil-comp7 geos: -- 3.6.2 +- 3.7.1 numpy: - '1.9' pin_run_as_build: @@ -22,10 +20,3 @@ pin_run_as_build: max_pin: x.x python: - '2.7' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml b/.ci_support/linux_python3.6.yaml similarity index 52% rename from .ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml rename to .ci_support/linux_python3.6.yaml index b2b2301..68c3acf 100644 --- a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,17 +1,15 @@ -build_number_decrement: -- '0' c_compiler: - gcc channel_sources: -- conda-forge/label/gcc7,defaults +- conda-forge,defaults channel_targets: -- conda-forge gcc7 +- conda-forge main cxx_compiler: - gxx docker_image: - condaforge/linux-anvil-comp7 geos: -- 3.6.2 +- 3.7.1 numpy: - '1.9' pin_run_as_build: @@ -22,10 +20,3 @@ pin_run_as_build: max_pin: x.x python: - '3.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml b/.ci_support/linux_python3.7.yaml similarity index 52% rename from .ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml rename to .ci_support/linux_python3.7.yaml index 5277431..d8ffb3d 100644 --- a/.ci_support/linux_c_compilergcccxx_compilergxxpython3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,17 +1,15 @@ -build_number_decrement: -- '0' c_compiler: - gcc channel_sources: -- conda-forge/label/gcc7,defaults +- conda-forge,defaults channel_targets: -- conda-forge gcc7 +- conda-forge main cxx_compiler: - gxx docker_image: - condaforge/linux-anvil-comp7 geos: -- 3.6.2 +- 3.7.1 numpy: - '1.9' pin_run_as_build: @@ -22,10 +20,3 @@ pin_run_as_build: max_pin: x.x python: - '3.7' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - docker_image - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml deleted file mode 100644 index b7d0d58..0000000 --- a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython2.7.yaml +++ /dev/null @@ -1,34 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -geos: -- 3.6.2 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.9' -pin_run_as_build: - geos: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml deleted file mode 100644 index 5e7a8a6..0000000 --- a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.6.yaml +++ /dev/null @@ -1,34 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -geos: -- 3.6.2 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.9' -pin_run_as_build: - geos: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml b/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml deleted file mode 100644 index 588c5ef..0000000 --- a/.ci_support/osx_c_compilerclangcxx_compilerclangxxpython3.7.yaml +++ /dev/null @@ -1,34 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -c_compiler: -- clang -channel_sources: -- conda-forge/label/gcc7,defaults -channel_targets: -- conda-forge gcc7 -cxx_compiler: -- clangxx -geos: -- 3.6.2 -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.9' -pin_run_as_build: - geos: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml b/.ci_support/osx_python2.7.yaml similarity index 64% rename from .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml rename to .ci_support/osx_python2.7.yaml index 55edae9..ab82b02 100644 --- a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -1,17 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx geos: -- 3.6.2 +- 3.7.1 macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -26,9 +24,3 @@ pin_run_as_build: max_pin: x.x python: - '2.7' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml b/.ci_support/osx_python3.6.yaml similarity index 64% rename from .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml rename to .ci_support/osx_python3.6.yaml index 2020efb..cddfa6b 100644 --- a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -1,17 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx geos: -- 3.6.2 +- 3.7.1 macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -26,9 +24,3 @@ pin_run_as_build: max_pin: x.x python: - '3.6' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml b/.ci_support/osx_python3.7.yaml similarity index 64% rename from .ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml rename to .ci_support/osx_python3.7.yaml index 47b01f7..5b2884f 100644 --- a/.ci_support/osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -1,17 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -build_number_decrement: -- '1000' c_compiler: -- toolchain_c +- clang channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- toolchain_cxx +- clangxx geos: -- 3.6.2 +- 3.7.1 macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: @@ -26,9 +24,3 @@ pin_run_as_build: max_pin: x.x python: - '3.7' -zip_keys: -- - c_compiler - - cxx_compiler - - channel_sources - - channel_targets - - build_number_decrement diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml index 1ff6675..2d9c70c 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2015 geos: -- 3.6.2 +- 3.7.1 pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml index 9be79ae..e443b16 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2015 geos: -- 3.6.2 +- 3.7.1 pin_run_as_build: geos: max_pin: x.x.x diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh index 258a085..1301eb6 100755 --- a/.circleci/build_steps.sh +++ b/.circleci/build_steps.sh @@ -19,22 +19,21 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge::conda-forge-ci-setup=2 conda-build +conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts. -conda clean --lock - source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ - --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" --quiet + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" -upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" +fi touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.circleci/config.yml b/.circleci/config.yml index 471da52..59da584 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,62 +1,15 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + version: 2 jobs: - build_linux_c_compilergcccxx_compilergxxpython2.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergcccxx_compilergxxpython2.7" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_c_compilergcccxx_compilergxxpython3.6: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergcccxx_compilergxxpython3.6" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_c_compilergcccxx_compilergxxpython3.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_c_compilergcccxx_compilergxxpython3.7" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7: + build_linux_python2.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7" + - CONFIG: "linux_python2.7" steps: - checkout - run: @@ -65,15 +18,15 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + command: docker pull condaforge/linux-anvil-comp7 - run: # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. command: ./.circleci/run_docker_build.sh - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6: + build_linux_python3.6: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6" + - CONFIG: "linux_python3.6" steps: - checkout - run: @@ -82,15 +35,15 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + command: docker pull condaforge/linux-anvil-comp7 - run: # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. command: ./.circleci/run_docker_build.sh - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7: + build_linux_python3.7: working_directory: ~/test machine: true environment: - - CONFIG: "linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7" + - CONFIG: "linux_python3.7" steps: - checkout - run: @@ -99,7 +52,7 @@ jobs: ./.circleci/fast_finish_ci_pr_build.sh ./.circleci/checkout_merge_commit.sh - run: - command: docker pull condaforge/linux-anvil + command: docker pull condaforge/linux-anvil-comp7 - run: # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. command: ./.circleci/run_docker_build.sh @@ -108,9 +61,6 @@ workflows: version: 2 build_and_test: jobs: - - build_linux_c_compilergcccxx_compilergxxpython2.7 - - build_linux_c_compilergcccxx_compilergxxpython3.6 - - build_linux_c_compilergcccxx_compilergxxpython3.7 - - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7 - - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6 - - build_linux_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7 + - build_linux_python2.7 + - build_linux_python3.6 + - build_linux_python3.7 diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh index 8c048ac..4c0b560 100755 --- a/.circleci/fast_finish_ci_pr_build.sh +++ b/.circleci/fast_finish_ci_pr_build.sh @@ -1,4 +1,4 @@ #!/bin/bash -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ +curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.circleci/run_docker_build.sh b/.circleci/run_docker_build.sh index f2959f6..8bb0bda 100755 --- a/.circleci/run_docker_build.sh +++ b/.circleci/run_docker_build.sh @@ -7,6 +7,9 @@ set -xeuo pipefail +THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" +PROVIDER_DIR="$(basename $THISDIR)" + FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" @@ -30,21 +33,25 @@ if [ -z "$CONFIG" ]; then fi pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil ) +DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" rm -f "$DONE_CANARY" +# Enable running in interactive mode attached to a tty +DOCKER_RUN_ARGS=" -it " -docker run -it \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \ +export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +docker run ${DOCKER_RUN_ARGS} \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ -e CONFIG \ -e BINSTAR_TOKEN \ -e HOST_USER_ID \ + -e UPLOAD_PACKAGES \ $DOCKER_IMAGE \ bash \ - /home/conda/feedstock_root/.circleci/build_steps.sh + /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh # verify that the end of the script was reached test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index d835b9c..b62250b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,18 @@ # This file was generated automatically from conda-smithy. To update this configuration, # update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- language: generic os: osx -osx_image: xcode6.4 +osx_image: xcode9.4 + env: matrix: - - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython2.7 - - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython3.6 - - CONFIG=osx_c_compilerclangcxx_compilerclangxxpython3.7 - - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython2.7 - - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.6 - - CONFIG=osx_c_compilertoolchain_ccxx_compilertoolchain_cxxpython3.7 + - CONFIG=osx_python2.7 + - CONFIG=osx_python3.6 + - CONFIG=osx_python3.7 global: # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. @@ -23,7 +22,7 @@ env: before_install: # Fast finish the PR. - | - (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ + (curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1 # Remove homebrew. @@ -52,7 +51,7 @@ install: echo "Configuring conda." source /Users/travis/miniconda3/bin/activate root - conda install --yes --quiet conda-forge::conda-forge-ci-setup=2 + conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml source run_conda_forge_build_setup @@ -64,5 +63,5 @@ install: script: # generate the build number clobber - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml \ No newline at end of file diff --git a/README.md b/README.md index a0e8515..85c0e6a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ + + About basemap ============= @@ -50,6 +54,8 @@ conda search basemap --channel conda-forge About conda-forge ================= +[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) + conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the conda-forge GitHub organization. The conda-forge organization contains one repository @@ -104,3 +110,9 @@ In order to produce a uniquely identifiable distribution: * If the version of a package **is** being increased, please remember to return the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string) back to 0. + +Feedstock Maintainers +===================== + +* [@ocefpaf](https://github.com/ocefpaf/) + diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..e5306da --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,8 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From cffdb7d7ebb1485cacec79af1540c2b3d5ba66b0 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Sat, 19 Jan 2019 19:57:54 -0500 Subject: [PATCH 11/56] 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 8fc1894..2fc3d25 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - use_proj_data.patch build: - number: 1000 + number: 1001 skip: True # [win and py2k] requirements: From cbce7fba9cdd9af0cb6d2d50ff0fb350545565f9 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Sat, 9 Mar 2019 08:42:01 -0300 Subject: [PATCH 12/56] pin pyproj --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2fc3d25..f2de7f1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - use_proj_data.patch build: - number: 1001 + number: 2 skip: True # [win and py2k] requirements: @@ -27,7 +27,7 @@ requirements: - numpy 1.14.* # [win] - geos - matplotlib >=1.0.0 - - pyproj >=1.9.3 + - pyproj >=1.9.3,<2 - pyshp >=1.2.0 - six run: @@ -35,7 +35,7 @@ requirements: - {{ pin_compatible('numpy') }} - geos - matplotlib >=1.0.0 - - pyproj >=1.9.3 + - pyproj >=1.9.3,<2 - pyshp >=1.2.0 - six From 2d22e1731f2f1ee989ddbbfbbbbdeff6987cb7ba Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Sat, 9 Mar 2019 08:42:06 -0300 Subject: [PATCH 13/56] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and conda-forge-pinning 2019.02.24 --- .appveyor.yml | 2 +- .azure-pipelines/azure-pipelines-linux.yml | 8 +++++--- .azure-pipelines/azure-pipelines-osx.yml | 4 +++- .azure-pipelines/azure-pipelines-win.yml | 21 +++++++++++++++------ 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 4a085b9..7122911 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -26,7 +26,7 @@ install: # If there is a newer build queued for the same PR, cancel this one. - cmd: | powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" - ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" + "%CONDA_INSTALL_LOCN%\python.exe" ff_ci_pr_build.py -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" del ff_ci_pr_build.py # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index eb9811e..7ac96fd 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -3,7 +3,7 @@ # -*- mode: yaml -*- jobs: -- job: linux_64 +- job: linux pool: vmImage: ubuntu-16.04 timeoutInMinutes: 240 @@ -28,10 +28,12 @@ jobs: # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | - docker run --rm --privileged multiarch/qemu-user-static:register + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes ls /proc/sys/fs/binfmt_misc/ condition: not(startsWith(variables['CONFIG'], 'linux_64')) displayName: Configure binfmt_misc - script: .azure-pipelines/run_docker_build.sh - displayName: Run docker build \ No newline at end of file + displayName: Run docker build + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 756bdbb..35efd7c 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -3,7 +3,7 @@ # -*- mode: yaml -*- jobs: -- job: osx_64 +- job: osx pool: vmImage: macOS-10.13 timeoutInMinutes: 240 @@ -87,4 +87,6 @@ jobs: set -x -e upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Upload recipe + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 3ac1bb4..26492a2 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -3,7 +3,7 @@ # -*- mode: yaml -*- jobs: -- job: win_64 +- job: win pool: vmImage: vs2017-win2016 timeoutInMinutes: 240 @@ -77,20 +77,29 @@ jobs: displayName: conda-forge build setup + - script: | + rmdir C:\strawberry /s /q + continueOnError: true + displayName: remove strawberryperl + # Special cased version setting some more things! - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + conda.exe build recipe -m .ci_support\%CONFIG%.yaml displayName: Build recipe (vs2008) - env: { - VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin", - } + env: + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" + PYTHONUNBUFFERED: 1 condition: contains(variables['CONFIG'], 'vs2008') - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + conda.exe build recipe -m .ci_support\%CONFIG%.yaml displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) From 38c3023e946c9276c83ffd1b62b124dd69a7a67f Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Sun, 26 May 2019 14:58:15 -0300 Subject: [PATCH 14/56] use mpl base --- recipe/meta.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f2de7f1..ce8f55c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - use_proj_data.patch build: - number: 2 + number: 3 skip: True # [win and py2k] requirements: @@ -23,10 +23,9 @@ requirements: - python - pip - cython - - numpy # [not win] - - numpy 1.14.* # [win] + - numpy - geos - - matplotlib >=1.0.0 + - matplotlib-base >=1.0.0 - pyproj >=1.9.3,<2 - pyshp >=1.2.0 - six @@ -34,7 +33,7 @@ requirements: - python - {{ pin_compatible('numpy') }} - geos - - matplotlib >=1.0.0 + - matplotlib-base >=1.0.0 - pyproj >=1.9.3,<2 - pyshp >=1.2.0 - six From a1b2b31dea27d551eaba7161d1f1faf43e038a40 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Sun, 26 May 2019 14:58:52 -0300 Subject: [PATCH 15/56] MNT: Re-rendered with conda-build 3.18.1, conda-smithy 3.3.4, and conda-forge-pinning 2019.05.26 --- .azure-pipelines/azure-pipelines-linux.yml | 10 +- .azure-pipelines/azure-pipelines-osx.yml | 41 +++------ .azure-pipelines/azure-pipelines-win.yml | 4 +- .azure-pipelines/run_docker_build.sh | 21 ++++- .ci_support/linux_python2.7.yaml | 6 +- .ci_support/linux_python3.6.yaml | 6 +- .ci_support/linux_python3.7.yaml | 6 +- .ci_support/osx_python2.7.yaml | 6 +- .ci_support/osx_python3.6.yaml | 6 +- .ci_support/osx_python3.7.yaml | 6 +- ...ilervs2015cxx_compilervs2015python3.6.yaml | 2 + ...ilervs2015cxx_compilervs2015python3.7.yaml | 2 + .circleci/build_steps.sh | 39 -------- .circleci/checkout_merge_commit.sh | 27 ------ .circleci/config.yml | 58 ++---------- .circleci/fast_finish_ci_pr_build.sh | 4 - .circleci/run_docker_build.sh | 57 ------------ .github/PULL_REQUEST_TEMPLATE.md | 2 +- .travis.yml | 67 -------------- LICENSE.txt | 2 +- README.md | 92 +++++++++++++++++-- 21 files changed, 168 insertions(+), 296 deletions(-) delete mode 100755 .circleci/build_steps.sh delete mode 100755 .circleci/checkout_merge_commit.sh delete mode 100755 .circleci/fast_finish_ci_pr_build.sh delete mode 100755 .circleci/run_docker_build.sh delete mode 100644 .travis.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7ac96fd..b484d51 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -6,26 +6,26 @@ jobs: - job: linux pool: vmImage: ubuntu-16.04 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: linux_python2.7: CONFIG: linux_python2.7 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True linux_python3.6: CONFIG: linux_python3.6 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True linux_python3.7: CONFIG: linux_python3.7 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: - script: | sudo pip install --upgrade pip sudo pip install setuptools shyaml displayName: Install dependencies - # configure qemu binfmt-misc running. This allows us to run docker containers + # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 35efd7c..694475d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -6,19 +6,19 @@ jobs: - job: osx pool: vmImage: macOS-10.13 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: osx_python2.7: CONFIG: osx_python2.7 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True osx_python3.6: CONFIG: osx_python3.6 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True osx_python3.7: CONFIG: osx_python3.7 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? @@ -34,25 +34,18 @@ jobs: rm ~/uninstall_homebrew displayName: Remove homebrew - - script: | - echo "Installing Miniconda" - set -x -e - curl -o $(Build.StagingDirectory)/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh - chmod +x $(Build.StagingDirectory)/miniconda.sh - $(Build.StagingDirectory)/miniconda.sh -b -p $(Build.StagingDirectory)/miniconda - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - echo "Setting up Conda environment" - displayName: 'Install miniconda' + - bash: | + echo "##vso[task.prependpath]$CONDA/bin" + sudo chown -R $USER $CONDA + displayName: Add conda to PATH - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e - conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build + source activate base + conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build shyaml displayName: 'Add conda-forge-ci-setup=2' - script: | - set -x -e - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + source activate base echo "Configuring conda." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml @@ -65,26 +58,22 @@ jobs: displayName: Configure conda and conda-build - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Mangle compiler - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Generate build number clobber file - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml displayName: Build recipe - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Upload recipe env: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 26492a2..8112e21 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -6,7 +6,7 @@ jobs: - job: win pool: vmImage: vs2017-win2016 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 4 matrix: @@ -69,7 +69,7 @@ jobs: # Configure the VM - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - + # Configure the VM. - script: | run_conda_forge_build_setup diff --git a/.azure-pipelines/run_docker_build.sh b/.azure-pipelines/run_docker_build.sh index 8ccadb8..7082794 100755 --- a/.azure-pipelines/run_docker_build.sh +++ b/.azure-pipelines/run_docker_build.sh @@ -5,7 +5,7 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. -set -xeuo pipefail +set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" PROVIDER_DIR="$(basename $THISDIR)" @@ -28,12 +28,25 @@ fi ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" if [ -z "$CONFIG" ]; then - echo "Need to set CONFIG env variable" + set +x + FILES=`ls .ci_support/linux_*` + CONFIGS="" + for file in $FILES; do + CONFIGS="${CONFIGS}'${file:12:-5}' or "; + done + echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}" exit 1 fi -pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) +if [ -z "${DOCKER_IMAGE}" ]; then + SHYAML_INSTALLED="$(shyaml --version || 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" + else + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + fi +fi mkdir -p "$ARTIFACTS" DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml index f3d6b8f..673bd63 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -1,17 +1,21 @@ 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 geos: - 3.7.1 numpy: -- '1.9' +- '1.14' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index 68c3acf..789f30c 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,17 +1,21 @@ 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 geos: - 3.7.1 numpy: -- '1.9' +- '1.14' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml index d8ffb3d..9c516c7 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,17 +1,21 @@ 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 geos: - 3.7.1 numpy: -- '1.9' +- '1.14' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml index ab82b02..96964c1 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - clangxx +cxx_compiler_version: +- '4' geos: - 3.7.1 macos_machine: @@ -15,7 +19,7 @@ macos_machine: macos_min_version: - '10.9' numpy: -- '1.9' +- '1.14' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml index cddfa6b..62fb4a4 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - clangxx +cxx_compiler_version: +- '4' geos: - 3.7.1 macos_machine: @@ -15,7 +19,7 @@ macos_machine: macos_min_version: - '10.9' numpy: -- '1.9' +- '1.14' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml index 5b2884f..ae62b16 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -2,12 +2,16 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: - clangxx +cxx_compiler_version: +- '4' geos: - 3.7.1 macos_machine: @@ -15,7 +19,7 @@ macos_machine: macos_min_version: - '10.9' numpy: -- '1.9' +- '1.14' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml index 2d9c70c..8885744 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml @@ -8,6 +8,8 @@ cxx_compiler: - vs2015 geos: - 3.7.1 +numpy: +- '1.14' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml index e443b16..3b611bd 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7.yaml @@ -8,6 +8,8 @@ cxx_compiler: - vs2015 geos: - 3.7.1 +numpy: +- '1.14' pin_run_as_build: geos: max_pin: x.x.x diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh deleted file mode 100755 index 1301eb6..0000000 --- a/.circleci/build_steps.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail -export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT=/home/conda/feedstock_root -export RECIPE_ROOT=/home/conda/recipe_root -export CI_SUPPORT=/home/conda/feedstock_root/.ci_support -export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" - -cat >~/.condarc < /dev/null -fi diff --git a/.circleci/config.yml b/.circleci/config.yml index 59da584..6ad461b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,62 +5,20 @@ version: 2 jobs: - build_linux_python2.7: + build: working_directory: ~/test machine: true - environment: - - CONFIG: "linux_python2.7" steps: - - checkout - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil-comp7 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_python3.6: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_python3.6" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil-comp7 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_python3.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_python3.7" - steps: - - checkout - - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - command: docker pull condaforge/linux-anvil-comp7 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh + # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. + command: exit 0 workflows: version: 2 build_and_test: jobs: - - build_linux_python2.7 - - build_linux_python3.6 - - build_linux_python3.7 + - build: + filters: + branches: + ignore: + - /.*/ diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh deleted file mode 100755 index 4c0b560..0000000 --- a/.circleci/fast_finish_ci_pr_build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.circleci/run_docker_build.sh b/.circleci/run_docker_build.sh deleted file mode 100755 index 8bb0bda..0000000 --- a/.circleci/run_docker_build.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail - -THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" -PROVIDER_DIR="$(basename $THISDIR)" - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" - -docker info - -# In order for the conda-build process in the container to write to the mounted -# volumes, we need to run with the same id as the host machine, which is -# normally the owner of the mounted volumes, or at least has write permission -export HOST_USER_ID=$(id -u) -# Check if docker-machine is being used (normally on OSX) and get the uid from -# the VM -if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then - export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) -fi - -ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" - -if [ -z "$CONFIG" ]; then - echo "Need to set CONFIG env variable" - exit 1 -fi - -pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) - -mkdir -p "$ARTIFACTS" -DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" -rm -f "$DONE_CANARY" -# Enable running in interactive mode attached to a tty -DOCKER_RUN_ARGS=" -it " - -export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" -docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ - -e CONFIG \ - -e BINSTAR_TOKEN \ - -e HOST_USER_ID \ - -e UPLOAD_PACKAGES \ - $DOCKER_IMAGE \ - bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh - -# verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 047fdaf..ba618a2 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ 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/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) +* [ ] [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. - About basemap ============= @@ -18,9 +14,91 @@ Summary: Plot on map projections using matplotlib Current build status ==================== -[![Linux](https://img.shields.io/circleci/project/github/conda-forge/basemap-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/basemap-feedstock) -[![OSX](https://img.shields.io/travis/conda-forge/basemap-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/basemap-feedstock) -[![Windows](https://img.shields.io/appveyor/ci/conda-forge/basemap-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/basemap-feedstock/branch/master) + + + + + + + + + + +![ppc64le disabled](https://img.shields.io/badge/ppc64le-disabled-lightgrey.svg) +
Appveyor + + windows + +
Azure +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariantStatus
linux_python2.7 + + variant + +
linux_python3.6 + + variant + +
linux_python3.7 + + variant + +
osx_python2.7 + + variant + +
osx_python3.6 + + variant + +
osx_python3.7 + + variant + +
win_c_compilervs2015cxx_compilervs2015python3.6 + + variant + +
win_c_compilervs2015cxx_compilervs2015python3.7 + + variant + +
+
+
Current release info ==================== From caa5181459e6dbe5b65bc185090a3d0cdb0bf0c6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Sun, 7 Jul 2019 23:28:10 +0000 Subject: [PATCH 16/56] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ce8f55c..1fd4249 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - use_proj_data.patch build: - number: 3 + number: 4 skip: True # [win and py2k] requirements: From fa99cb93450224078dba4ee76d36cd89b61359ee Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Sun, 7 Jul 2019 23:28:22 +0000 Subject: [PATCH 17/56] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.4.0, and conda-forge-pinning 2019.07.04 --- .appveyor.yml | 1 + .azure-pipelines/azure-pipelines-linux.yml | 12 ++-- .azure-pipelines/azure-pipelines-osx.yml | 4 +- .azure-pipelines/azure-pipelines-win.yml | 2 +- .azure-pipelines/build_steps.sh | 13 +++-- .azure-pipelines/run_docker_build.sh | 7 ++- .ci_support/linux_python2.7.yaml | 4 +- .ci_support/linux_python3.6.yaml | 4 +- .ci_support/linux_python3.7.yaml | 4 +- .ci_support/osx_python2.7.yaml | 4 +- .ci_support/osx_python3.6.yaml | 4 +- .ci_support/osx_python3.7.yaml | 4 +- ...ilervs2015cxx_compilervs2015python3.6.yaml | 4 +- ...ilervs2015cxx_compilervs2015python3.7.yaml | 4 +- .github/CODEOWNERS | 1 + build-locally.py | 58 +++++++++++++++++++ 16 files changed, 89 insertions(+), 41 deletions(-) create mode 100644 .github/CODEOWNERS create mode 100755 build-locally.py diff --git a/.appveyor.yml b/.appveyor.yml index 7122911..654a675 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -23,6 +23,7 @@ platform: - x64 install: + - cmd: set "CI=appveyor" # If there is a newer build queued for the same PR, cancel this one. - cmd: | powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index b484d51..f141f95 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,18 +13,16 @@ jobs: 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 + DOCKER_IMAGE: condaforge/linux-anvil-comp7 linux_python3.7: CONFIG: linux_python3.7 UPLOAD_PACKAGES: True + DOCKER_IMAGE: condaforge/linux-anvil-comp7 steps: - - script: | - sudo pip install --upgrade pip - sudo pip install setuptools shyaml - displayName: Install dependencies - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -33,7 +31,9 @@ jobs: condition: not(startsWith(variables['CONFIG'], 'linux_64')) displayName: Configure binfmt_misc - - script: .azure-pipelines/run_docker_build.sh + - script: | + export CI=azure + .azure-pipelines/run_docker_build.sh displayName: Run docker build env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 694475d..bc6f0f8 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -41,7 +41,7 @@ jobs: - script: | source activate base - conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build shyaml + conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build displayName: 'Add conda-forge-ci-setup=2' - script: | @@ -49,7 +49,7 @@ jobs: echo "Configuring conda." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - + export CI=azure source run_conda_forge_build_setup conda update --yes --quiet --override-channels -c conda-forge -c defaults --all env: { diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8112e21..6f4c5f4 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -72,8 +72,8 @@ jobs: # Configure the VM. - script: | + set "CI=azure" run_conda_forge_build_setup - displayName: conda-forge build setup diff --git a/.azure-pipelines/build_steps.sh b/.azure-pipelines/build_steps.sh index 779d52b..8a4af44 100755 --- a/.azure-pipelines/build_steps.sh +++ b/.azure-pipelines/build_steps.sh @@ -7,15 +7,15 @@ set -xeuo pipefail export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT=/home/conda/feedstock_root -export RECIPE_ROOT=/home/conda/recipe_root -export CI_SUPPORT=/home/conda/feedstock_root/.ci_support +export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" +export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" cat >~/.condarc < ") + idx = int(s) - 1 + ns.config = selections[idx][1] + print(f"selected {ns.config}") + else: + raise ValueError("config " + ns.config + " is not valid") + # Remove the following, as implemented + if not ns.config.startswith('linux'): + raise ValueError(f"only Linux configs currently supported, got {ns.config}") + + +def main(args=None): + p = ArgumentParser("build-locally") + p.add_argument("config", default=None, nargs="?") + + ns = p.parse_args(args=args) + verify_config(ns) + setup_environment(ns) + + run_docker_build(ns) + + +if __name__ == "__main__": + main() \ No newline at end of file From e7840205d697a52880b7f42107174c20174e6110 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Thu, 8 Aug 2019 01:26:26 +0000 Subject: [PATCH 18/56] updated v1.2.1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1fd4249..128ba2e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.2.0" %} +{% set version = "1.2.1" %} package: name: basemap @@ -6,13 +6,13 @@ package: source: url: https://github.com/matplotlib/basemap/archive/v{{ version }}rel.tar.gz - sha256: bd5bf305918a2eb675939873b735238f9e3dfe6b5c290e37c41e5b082ff3639a + sha256: 3fb30424f18cd4ffd505e30fd9c810ae81b999bb92f950c76553e1abc081faa7 patches: - basemap-1.0.8dev-datadir.patch - use_proj_data.patch build: - number: 4 + number: 0 skip: True # [win and py2k] requirements: From d8ebb19299b2d3367aba166cea263372ed3cffd9 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Thu, 8 Aug 2019 01:26:39 +0000 Subject: [PATCH 19/56] MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.1, and conda-forge-pinning 2019.07.26 --- .azure-pipelines/run_docker_build.sh | 2 +- .github/CODEOWNERS | 2 +- .github/CONTRIBUTING.md | 15 --------------- .github/ISSUE_TEMPLATE.md | 25 ------------------------- .github/PULL_REQUEST_TEMPLATE.md | 18 ------------------ build-locally.py | 4 ++-- 6 files changed, 4 insertions(+), 62 deletions(-) delete mode 100644 .github/CONTRIBUTING.md delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md 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/.github/CODEOWNERS b/.github/CODEOWNERS index e1edb76..4528b37 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @ocefpaf +* @ocefpaf \ 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/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 364a23399ca2b4b2f6e8f7a0d12901ec43d65830 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Tue, 13 Aug 2019 17:34:10 +0000 Subject: [PATCH 20/56] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 128ba2e..7704d5c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - use_proj_data.patch build: - number: 0 + number: 1 skip: True # [win and py2k] requirements: From 8733005fab048120c6665577eb807087781ee361 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Mon, 4 Nov 2019 13:25:40 +0000 Subject: [PATCH 21/56] bump build number --- .ci_support/migrations/python38.yaml | 55 ++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .ci_support/migrations/python38.yaml diff --git a/.ci_support/migrations/python38.yaml b/.ci_support/migrations/python38.yaml new file mode 100644 index 0000000..b11022c --- /dev/null +++ b/.ci_support/migrations/python38.yaml @@ -0,0 +1,55 @@ +migrator_ts: 1569538102 # The timestamp of when the migration was made +__migrator: + kind: + version + exclude: + - c_compiler + - vc + - cxx_compiler + migration_number: # Only use this if the bot messes up, putting this in will cause a complete rerun of the migration + 1 + bump_number: 0 + +python: + - 2.7 + - 3.6 + - 3.7 + - 3.8 + +c_compiler: + # legacy compilers for things that refuse to move + - toolchain_c # [(linux64 or osx) and (environ.get('CF_COMPILER_STACK') == 'comp4')] + # modern compilers + - gcc # [linux64] + - clang # [osx] + # non-standard arches get built with gcc + - gcc # [aarch64] + - gcc # [ppc64le] + - gcc # [armv7l] + + - vs2008 # [win] + - vs2015 # [win] + - vs2015 # [win] + - vs2015 # [win] + +cxx_compiler: + # legacy compilers for things that refuse to move + - toolchain_cxx # [(linux64 or osx) and (environ.get('CF_COMPILER_STACK') == 'comp4')] + # modern compilers + - gxx # [linux64] + - clangxx # [osx] + + - gxx # [aarch64] + - gxx # [ppc64le] + - gxx # [armv7l] + + - vs2008 # [win] + - vs2015 # [win] + - vs2015 # [win] + - vs2015 # [win] + +vc: # [win] + - 9 # [win] + - 14 # [win] + - 14 # [win] + - 14 # [win] From 3680855aff3fae29965950499f0a7003b12c2c84 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Wed, 27 Nov 2019 22:25:19 +0000 Subject: [PATCH 22/56] bump build number --- .ci_support/migrations/geos-3.8.0.yaml | 22 ++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/geos-3.8.0.yaml diff --git a/.ci_support/migrations/geos-3.8.0.yaml b/.ci_support/migrations/geos-3.8.0.yaml new file mode 100644 index 0000000..2e5f95e --- /dev/null +++ b/.ci_support/migrations/geos-3.8.0.yaml @@ -0,0 +1,22 @@ +# To learn more about migrations read CFEP-09 +# https://github.com/conda-forge/conda-forge-enhancement-proposals/blob/master/cfep-09.md +# The timestamp of when the migration was made +# Can be obtained by copying the output of +# python -c "import time; print(f'{time.time():.0f}')" +migrator_ts: 1574860028 +__migrator: + kind: + version + # Only change the migration_number if the bot messes up, + # changing this will cause a complete rerun of the migration + migration_number: + 1 + # This determines the increment to the build number when the + # migration runs. + # Change this to zero if the new pin increases the number of builds + build_number: + 1 + +# The name of the feedstock you wish to migrate +geos: + - 3.8.0 # new version to build against diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7704d5c..efab0ec 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - use_proj_data.patch build: - number: 1 + number: 2 skip: True # [win and py2k] requirements: From 1852ea05ac92ead09585d9abd74189624c2b4bf5 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Mon, 2 Mar 2020 15:27:57 +0000 Subject: [PATCH 23/56] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration AutomergeAndRerender --- .github/workflows/main.yml | 18 ++++++++++++++++++ .github/workflows/webservices.yml | 12 ++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 .github/workflows/main.yml create mode 100644 .github/workflows/webservices.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..0e9646a --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,18 @@ +on: + status: {} + check_suite: + types: + - completed + +jobs: + regro-cf-autotick-bot-action: + runs-on: ubuntu-latest + name: regro-cf-autotick-bot-action + steps: + - name: checkout + uses: actions/checkout@v2 + - name: regro-cf-autotick-bot-action + id: regro-cf-autotick-bot-action + uses: regro/cf-autotick-bot-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/webservices.yml b/.github/workflows/webservices.yml new file mode 100644 index 0000000..78f51e6 --- /dev/null +++ b/.github/workflows/webservices.yml @@ -0,0 +1,12 @@ +on: repository_dispatch + +jobs: + webservices: + runs-on: ubuntu-latest + name: webservices + steps: + - name: webservices + id: webservices + uses: conda-forge/webservices-dispatch-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} From 5558346d9508bf27d8195621faa2829bcdcab21b Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Thu, 12 Mar 2020 12:44:14 -0300 Subject: [PATCH 24/56] use commit that updates proj --- recipe/meta.yaml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index efab0ec..ae901c0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,18 +1,20 @@ -{% set version = "1.2.1" %} +{% set commit = "bcad813b56e5c4cc9295760ac6683b46aecfd534" %} +{% set version = "1.3.0" %} package: name: basemap version: {{ version }} source: - url: https://github.com/matplotlib/basemap/archive/v{{ version }}rel.tar.gz - sha256: 3fb30424f18cd4ffd505e30fd9c810ae81b999bb92f950c76553e1abc081faa7 + # url: https://github.com/matplotlib/basemap/archive/v{{ version }}rel.tar.gz + url: https://github.com/matplotlib/basemap/archive/{{ commit }}.tar.gz + sha256: 55b79c5ce09f153339c3a079eed2f739a0f2d6e5f933862b26fc70d026a8a4c1 patches: - basemap-1.0.8dev-datadir.patch - use_proj_data.patch build: - number: 2 + number: 0 skip: True # [win and py2k] requirements: @@ -25,17 +27,19 @@ requirements: - cython - numpy - geos - - matplotlib-base >=1.0.0 - - pyproj >=1.9.3,<2 - - pyshp >=1.2.0 - - six + # - matplotlib-base >=1.0.0,!=3.0.1 + - pyproj + - proj + # - pyshp >=1.2.0 + # - six run: - python - {{ pin_compatible('numpy') }} - geos - - matplotlib-base >=1.0.0 - - pyproj >=1.9.3,<2 + - matplotlib-base >=1.0.0,!=3.0.1 + - pyproj - pyshp >=1.2.0 + - proj - six test: From 2539f7adb4b77a9d17764ce2b9c931d001ffe596 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Thu, 12 Mar 2020 13:29:04 -0300 Subject: [PATCH 25/56] clean ups --- recipe/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ae901c0..d6d8c60 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -6,7 +6,6 @@ package: version: {{ version }} source: - # url: https://github.com/matplotlib/basemap/archive/v{{ version }}rel.tar.gz url: https://github.com/matplotlib/basemap/archive/{{ commit }}.tar.gz sha256: 55b79c5ce09f153339c3a079eed2f739a0f2d6e5f933862b26fc70d026a8a4c1 patches: @@ -27,11 +26,8 @@ requirements: - cython - numpy - geos - # - matplotlib-base >=1.0.0,!=3.0.1 - pyproj - proj - # - pyshp >=1.2.0 - # - six run: - python - {{ pin_compatible('numpy') }} From 0fc4693f4f9f1288b62de089783320d04b2322db Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Thu, 12 Mar 2020 16:48:39 +0000 Subject: [PATCH 26/56] Rebuild for geos-3.8.1 --- .ci_support/migrations/geos-3.8.1.yaml | 23 +++++++++++++++++++++++ conda-forge.yml | 3 --- recipe/meta.yaml | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 .ci_support/migrations/geos-3.8.1.yaml diff --git a/.ci_support/migrations/geos-3.8.1.yaml b/.ci_support/migrations/geos-3.8.1.yaml new file mode 100644 index 0000000..7a0a11e --- /dev/null +++ b/.ci_support/migrations/geos-3.8.1.yaml @@ -0,0 +1,23 @@ +# To learn more about migrations read CFEP-09 +# https://github.com/conda-forge/conda-forge-enhancement-proposals/blob/master/cfep-09.md +# The timestamp of when the migration was made +# Can be obtained by copying the output of +# python -c "import time; print(f'{time.time():.0f}')" +migrator_ts: 1583932366 +__migrator: + kind: + version + # Only change the migration_number if the bot messes up, + # changing this will cause a complete rerun of the migration + migration_number: + 1 + # This determines the increment to the build number when the + # migration runs. + # Change this to zero if the new pin increases the number of builds + build_number: + 1 + +# The name of the feedstock you wish to migrate with dashes replaced by +# underscores +geos: + - 3.8.1 # new version to build against diff --git a/conda-forge.yml b/conda-forge.yml index cd82191..8f1111a 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,4 @@ appveyor: secure: {BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1} -compiler_stack: comp7 -max_py_ver: '37' -max_r_ver: '35' travis: secure: {BINSTAR_TOKEN: ESHO3IQAsYAgHAS74dh4iC9L2kXKYQhj2K0i8O4axmrTdFf6vNrxf+Fnfb9U56k63qu+o5vBH66Kp2CR9T6eaH2Wg0KwOuKVSPiwmdc17QA/JGsgBldc4fiammT27pLRjgy+ewfNnxUMIlccMKXqVbTO6z+6pkzfJcr4gWlUjAN46eOWCcYZ2RiUdVCsUgZytEU7+EEO+optlp22h1ADNN8QBpVJ3MdK/G57P/VzBa+79ZTRfQUKzW9Vv4ub+T4AszRIprorx/ulL/XxgmN0qtEcSClBYdrMKl/3nZ5rK9jtqVkMLyCXhUV0oUoZMZ9M8VTRpM+ya99iHGEg2EazDmf4rI/H6TFKJtgRlVLz427EPnwq4JtNaozonsPizdHNu7JAY/rWf/h61aW3i3B/tqGW+RiuWKfsK7yBqgmPv/gHAzTSlD0yQEAXlirHEUJzrg/tbCB/5xxXKYjZZaFdDJZVHzeaULbW/MVVjOWdff1B7T+zyzbBj5xIymmqzYAaahFJDSLVxREwLH1hGJS2jMzwmlCFNZw8rRkv4hlC2OylyGWlogOQEgjqTRLJdE2pG+6sAQNKC3zswNNGGMUkOWUaVOrI4k/5nK6miJSQyUzXzGAhbZmX4f0YgOy3oI1KZ5f1Y0UxhMiC7GCRm6ROeDkEkYc4T1QQGUVxZ27U0SM=} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d6d8c60..0f33885 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - use_proj_data.patch build: - number: 0 + number: 1 skip: True # [win and py2k] requirements: From 7fea6caca7a1982bfd889a9373eb78fab2f1e57c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Thu, 12 Mar 2020 16:49:04 +0000 Subject: [PATCH 27/56] MNT: Re-rendered with conda-build 3.19.0, conda-smithy 3.6.12, and conda-forge-pinning 2020.03.10 --- .ci_support/migrations/geos-3.8.1.yaml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 .ci_support/migrations/geos-3.8.1.yaml diff --git a/.ci_support/migrations/geos-3.8.1.yaml b/.ci_support/migrations/geos-3.8.1.yaml deleted file mode 100644 index 7a0a11e..0000000 --- a/.ci_support/migrations/geos-3.8.1.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# To learn more about migrations read CFEP-09 -# https://github.com/conda-forge/conda-forge-enhancement-proposals/blob/master/cfep-09.md -# The timestamp of when the migration was made -# Can be obtained by copying the output of -# python -c "import time; print(f'{time.time():.0f}')" -migrator_ts: 1583932366 -__migrator: - kind: - version - # Only change the migration_number if the bot messes up, - # changing this will cause a complete rerun of the migration - migration_number: - 1 - # This determines the increment to the build number when the - # migration runs. - # Change this to zero if the new pin increases the number of builds - build_number: - 1 - -# The name of the feedstock you wish to migrate with dashes replaced by -# underscores -geos: - - 3.8.1 # new version to build against From 357689b46ecbc3457404dc9b1947b5608eaf7727 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Wed, 8 Apr 2020 18:51:51 +0000 Subject: [PATCH 28/56] Rebuild for proj700 --- .ci_support/migrations/proj700.yaml | 23 +++++++++++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/proj700.yaml diff --git a/.ci_support/migrations/proj700.yaml b/.ci_support/migrations/proj700.yaml new file mode 100644 index 0000000..e41186f --- /dev/null +++ b/.ci_support/migrations/proj700.yaml @@ -0,0 +1,23 @@ +# To learn more about migrations read CFEP-09 +# https://github.com/conda-forge/conda-forge-enhancement-proposals/blob/master/cfep-09.md +# The timestamp of when the migration was made +# Can be obtained by copying the output of +# python -c "import time; print(f'{time.time():.0f}')" +migrator_ts: 1586207215 +__migrator: + kind: + version + # Only change the migration_number if the bot messes up, + # changing this will cause a complete rerun of the migration + migration_number: + 1 + # This determines the increment to the build number when the + # migration runs. + # Change this to zero if the new pin increases the number of builds + build_number: + 1 + +# The name of the feedstock you wish to migrate with dashes replaced by +# underscores +proj: + - 7.0.0 # new version to build against diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0f33885..1eb0f15 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - use_proj_data.patch build: - number: 1 + number: 2 skip: True # [win and py2k] requirements: From 7d711b893a00a2008549e494bc7fa4e5aaca40bb Mon Sep 17 00:00:00 2001 From: Matthew R Becker Date: Mon, 18 May 2020 06:45:54 -0500 Subject: [PATCH 29/56] [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomerge --- .github/workflows/{main.yml => automerge.yml} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{main.yml => automerge.yml} (52%) diff --git a/.github/workflows/main.yml b/.github/workflows/automerge.yml similarity index 52% rename from .github/workflows/main.yml rename to .github/workflows/automerge.yml index 0e9646a..e8e5902 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/automerge.yml @@ -5,14 +5,14 @@ on: - completed jobs: - regro-cf-autotick-bot-action: + automerge-action: runs-on: ubuntu-latest - name: regro-cf-autotick-bot-action + name: automerge steps: - name: checkout uses: actions/checkout@v2 - - name: regro-cf-autotick-bot-action - id: regro-cf-autotick-bot-action - uses: regro/cf-autotick-bot-action@master + - name: automerge-action + id: automerge-action + uses: conda-forge/automerge-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} From 7fcd951cb0278ff829e9283725a9b6d1e136491b Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 27 May 2020 12:00:49 +0200 Subject: [PATCH 30/56] Reset build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1eb0f15..d6d8c60 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - use_proj_data.patch build: - number: 2 + number: 0 skip: True # [win and py2k] requirements: From 30bfe23a8a0dc26a4b0ab0d3a2d06b665e7bc678 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Thu, 26 Aug 2021 09:31:30 +0200 Subject: [PATCH 31/56] Fix basemap and store as 1.2.2 (synchronize with CF) --- recipe/backport_386.patch | 20 -------- ...emap-1.0.8dev-datadir.patch => data.patch} | 47 ++++++++++++------- recipe/meta.yaml | 12 ++--- recipe/remove_is_scalar.patch | 30 ------------ 4 files changed, 36 insertions(+), 73 deletions(-) delete mode 100644 recipe/backport_386.patch rename recipe/{basemap-1.0.8dev-datadir.patch => data.patch} (60%) delete mode 100644 recipe/remove_is_scalar.patch diff --git a/recipe/backport_386.patch b/recipe/backport_386.patch deleted file mode 100644 index 04dafb5..0000000 --- a/recipe/backport_386.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- basemap-1.1.0.orig/lib/mpl_toolkits/basemap/__init__.py 2017-05-04 13:53:42.000000000 -0700 -+++ basemap-1.1.0/lib/mpl_toolkits/basemap/__init__.py 2018-02-12 10:36:13.000000000 -0800 -@@ -1296,7 +1296,7 @@ - # numpy array (first column is lons, second is lats). - polystring = bdatfile.read(bytecount) - # binary data is little endian. -- b = np.array(np.fromstring(polystring,dtype='=1.0.0,!=3.0.1 - - pyproj + - pyproj >=1.9.3 - pyshp >=1.2.0 - proj - six diff --git a/recipe/remove_is_scalar.patch b/recipe/remove_is_scalar.patch deleted file mode 100644 index f7a3772..0000000 --- a/recipe/remove_is_scalar.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/lib/mpl_toolkits/basemap/__init__.py b/lib/mpl_toolkits/basemap/__init__.py -index 10fb6d0..d9ec13c 100644 ---- a/lib/mpl_toolkits/basemap/__init__.py -+++ b/lib/mpl_toolkits/basemap/__init__.py -@@ -14,7 +14,7 @@ heavy lifting), and the following functions: - """ - from distutils.version import LooseVersion - from matplotlib import __version__ as _matplotlib_version --from matplotlib.cbook import is_scalar, dedent -+from matplotlib.cbook import dedent - # check to make sure matplotlib is not too old. - _matplotlib_version = LooseVersion(_matplotlib_version) - _mpl_required_version = LooseVersion('0.98') -@@ -4980,12 +4980,11 @@ def interp(datain,xin,yin,xout,yout,checkbounds=False,masked=False,order=1): - dataout = map_coordinates(datain,coords,order=3,mode='nearest') - else: - raise ValueError('order keyword must be 0, 1 or 3') -- if masked and isinstance(masked,bool): -- dataout = ma.masked_array(dataout) -+ if masked: - newmask = ma.mask_or(ma.getmask(dataout), xymask) -- dataout = ma.masked_array(dataout,mask=newmask) -- elif masked and is_scalar(masked): -- dataout = np.where(xymask,masked,dataout) -+ dataout = ma.masked_array(dataout, mask=newmask) -+ if not isinstance(masked, bool): -+ dataout = dataout.filled(masked) - return dataout - - def shiftgrid(lon0,datain,lonsin,start=True,cyclic=360.0): From b8545f24b712fbdec83fea48d2a86b0fcbc60aab Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Thu, 26 Aug 2021 11:26:39 +0200 Subject: [PATCH 32/56] bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8a4d61b..d6d7228 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: - data.patch build: - number: 0 + number: 1 skip: True # [win and py2k] requirements: From dd5c17e525523b657afe1da1001e106dfc368695 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Thu, 26 Aug 2021 11:27:33 +0200 Subject: [PATCH 33/56] adjust old patch for historical reason --- recipe/use_proj_data.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/use_proj_data.patch b/recipe/use_proj_data.patch index 13e8a18..f919292 100644 --- a/recipe/use_proj_data.patch +++ b/recipe/use_proj_data.patch @@ -1,10 +1,10 @@ --- basemap-1.1.0.orig/lib/mpl_toolkits/basemap/__init__.py 2017-05-04 17:53:42.000000000 -0300 +++ basemap-1.1.0/lib/mpl_toolkits/basemap/__init__.py 2018-08-31 13:09:10.768728089 -0300 -@@ -140,7 +140,8 @@ +@@ -154,7 +154,8 @@ } # create dictionary that maps epsg codes to Basemap kwargs. --epsgf = open(os.path.join(pyproj.pyproj_datadir,'epsg')) +-epsgf = open(os.path.join(basemap_datadir,'epsg')) +pyproj_datadir = os.environ['PROJ_LIB'] +epsgf = open(os.path.join(pyproj_datadir,'epsg')) epsg_dict={} From ddb1cea4201f07d93bd03e02f103b8890a1521a8 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Wed, 22 Dec 2021 10:16:36 +0000 Subject: [PATCH 34/56] Add license_family, dev_url, pip check --- recipe/meta.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d6d7228..543bd73 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: - data.patch build: - number: 1 + number: 2 skip: True # [win and py2k] requirements: @@ -39,15 +39,22 @@ requirements: test: imports: - mpl_toolkits.basemap + requires: + - pip + commands: + - pip check + - python -c "from mpl_toolkits.basemap import Basemap" about: home: http://matplotlib.org/basemap license: MIT + license_family: MIT license_file: README.md summary: 'Plot on map projections using matplotlib' description: | Basemap toolkit is a library for plotting 2D data on maps in Python. It is similar in functionality to the matlab mapping toolbox, the IDL mapping facilities, GrADS, or the Generic Mapping Tools. + dev_url: https://github.com/matplotlib/basemap doc_url: http://matplotlib.org/basemap/ doc_source_url: https://github.com/matplotlib/basemap/blob/master/doc/index.rst From b6a19484c9bd59fcdb747a274fc081d5dcade0b0 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Wed, 22 Dec 2021 10:22:27 +0000 Subject: [PATCH 35/56] Skip s390x, add (m2)-patch --- recipe/meta.yaml | 4 + recipe/recipe_log.txt | 705 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 709 insertions(+) create mode 100644 recipe/recipe_log.txt diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 543bd73..7470a5d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,12 +12,16 @@ source: build: number: 2 + # This package isn't included to the SOW Packages list + skip: True # [linux and s390x] skip: True # [win and py2k] requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} + - m2-patch # [win] + - patch # [not win] host: - python - pip diff --git a/recipe/recipe_log.txt b/recipe/recipe_log.txt new file mode 100644 index 0000000..9d2402d --- /dev/null +++ b/recipe/recipe_log.txt @@ -0,0 +1,705 @@ +commit ddb1cea4201f07d93bd03e02f103b8890a1521a8 +Author: Serhii Kupriienko +Date: Wed Dec 22 10:16:36 2021 +0000 + + Add license_family, dev_url, pip check + +commit dd5c17e525523b657afe1da1001e106dfc368695 +Author: Kai Tietz +Date: Thu Aug 26 11:27:33 2021 +0200 + + adjust old patch for historical reason + +commit b8545f24b712fbdec83fea48d2a86b0fcbc60aab +Author: Kai Tietz +Date: Thu Aug 26 11:26:39 2021 +0200 + + bump build number + +commit 30bfe23a8a0dc26a4b0ab0d3a2d06b665e7bc678 +Author: Kai Tietz +Date: Thu Aug 26 09:31:30 2021 +0200 + + Fix basemap and store as 1.2.2 (synchronize with CF) + +commit 7fcd951cb0278ff829e9283725a9b6d1e136491b +Author: Kai Tietz +Date: Wed May 27 12:00:49 2020 +0200 + + Reset build number + +commit 7d711b893a00a2008549e494bc7fa4e5aaca40bb +Author: Matthew R Becker +Date: Mon May 18 06:45:54 2020 -0500 + + [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomerge + +commit 357689b46ecbc3457404dc9b1947b5608eaf7727 +Author: regro-cf-autotick-bot +Date: Wed Apr 8 18:51:51 2020 +0000 + + Rebuild for proj700 + +commit 7fea6caca7a1982bfd889a9373eb78fab2f1e57c +Author: regro-cf-autotick-bot +Date: Thu Mar 12 16:49:04 2020 +0000 + + MNT: Re-rendered with conda-build 3.19.0, conda-smithy 3.6.12, and conda-forge-pinning 2020.03.10 + +commit 0fc4693f4f9f1288b62de089783320d04b2322db +Author: regro-cf-autotick-bot +Date: Thu Mar 12 16:48:39 2020 +0000 + + Rebuild for geos-3.8.1 + +commit 2539f7adb4b77a9d17764ce2b9c931d001ffe596 +Author: Filipe Fernandes +Date: Thu Mar 12 13:29:04 2020 -0300 + + clean ups + +commit 5558346d9508bf27d8195621faa2829bcdcab21b +Author: Filipe Fernandes +Date: Thu Mar 12 12:44:14 2020 -0300 + + use commit that updates proj + +commit 1852ea05ac92ead09585d9abd74189624c2b4bf5 +Author: conda-forge-admin +Date: Mon Mar 2 15:27:57 2020 +0000 + + [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration AutomergeAndRerender + +commit 3680855aff3fae29965950499f0a7003b12c2c84 +Author: regro-cf-autotick-bot +Date: Wed Nov 27 22:25:19 2019 +0000 + + bump build number + +commit 8733005fab048120c6665577eb807087781ee361 +Author: regro-cf-autotick-bot +Date: Mon Nov 4 13:25:40 2019 +0000 + + bump build number + +commit 364a23399ca2b4b2f6e8f7a0d12901ec43d65830 +Author: regro-cf-autotick-bot +Date: Tue Aug 13 17:34:10 2019 +0000 + + bump build number + +commit d8ebb19299b2d3367aba166cea263372ed3cffd9 +Author: regro-cf-autotick-bot +Date: Thu Aug 8 01:26:39 2019 +0000 + + MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.1, and conda-forge-pinning 2019.07.26 + +commit e7840205d697a52880b7f42107174c20174e6110 +Author: regro-cf-autotick-bot +Date: Thu Aug 8 01:26:26 2019 +0000 + + updated v1.2.1 + +commit fa99cb93450224078dba4ee76d36cd89b61359ee +Author: regro-cf-autotick-bot +Date: Sun Jul 7 23:28:22 2019 +0000 + + MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.4.0, and conda-forge-pinning 2019.07.04 + +commit caa5181459e6dbe5b65bc185090a3d0cdb0bf0c6 +Author: regro-cf-autotick-bot +Date: Sun Jul 7 23:28:10 2019 +0000 + + bump build number + +commit a1b2b31dea27d551eaba7161d1f1faf43e038a40 +Author: Filipe Fernandes +Date: Sun May 26 14:58:52 2019 -0300 + + MNT: Re-rendered with conda-build 3.18.1, conda-smithy 3.3.4, and conda-forge-pinning 2019.05.26 + +commit 38c3023e946c9276c83ffd1b62b124dd69a7a67f +Author: Filipe Fernandes +Date: Sun May 26 14:58:15 2019 -0300 + + use mpl base + +commit 2d22e1731f2f1ee989ddbbfbbbbdeff6987cb7ba +Author: Filipe Fernandes +Date: Sat Mar 9 08:42:06 2019 -0300 + + MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and conda-forge-pinning 2019.02.24 + +commit cbce7fba9cdd9af0cb6d2d50ff0fb350545565f9 +Author: Filipe Fernandes +Date: Sat Mar 9 08:42:01 2019 -0300 + + pin pyproj + +commit cffdb7d7ebb1485cacec79af1540c2b3d5ba66b0 +Author: Marius van Niekerk +Date: Sat Jan 19 19:57:54 2019 -0500 + + Update meta.yaml + +commit ca37f851bebc51ee17d1a3c06d05a1fc5bf1845b +Author: conda-forge-admin +Date: Sun Jan 20 00:38:29 2019 +0000 + + MNT: Re-rendered with conda-build 3.17.5, conda-smithy 3.2.9, and conda-forge-pinning 2019.01.18 + +commit bde86a25e31aa66f91ad1c01408675c7ea6d108b +Author: conda-forge-admin +Date: Tue Oct 30 01:58:41 2018 +0000 + + MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.16 + +commit 7397d94b5cbd6e0d8f2a6ed8c73d0d4d7a719637 +Author: Filipe +Date: Mon Oct 29 22:57:50 2018 -0300 + + Update meta.yaml + +commit df1c7ded72d5a64081498c5da37437e49af80843 +Author: regro-cf-autotick-bot +Date: Tue Oct 30 01:15:31 2018 +0000 + + MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.16 + +commit e2aa5c2730cdda0e81ed384389aa9a920e5bf893 +Author: regro-cf-autotick-bot +Date: Tue Oct 30 01:15:26 2018 +0000 + + bump build number + +commit ee1455cdb540f9ddcbf1cff60b2769fff2b7fc43 +Author: Jonathan Helmus +Date: Wed Oct 10 09:49:50 2018 -0500 + + use setuptools for install on windows + +commit d6f2b8e03e8ddcd213f2227e3aaf99963c0b6cc7 +Author: Jonathan Helmus +Date: Wed Oct 10 09:49:41 2018 -0500 + + remote --no-cache-dir + +commit a008555d5dafb30e2dada9ad132fa8c7facd6985 +Author: Jonathan Helmus +Date: Wed Oct 10 09:48:40 2018 -0500 + + add descriptions to about section + +commit e04b3fd591799e8192e8dcdede9960e0e65c3874 +Author: Jonathan Helmus +Date: Wed Oct 10 09:48:28 2018 -0500 + + enable windows py27 build + +commit d3601e47709ca686c2e16587cf7271782ee70056 +Author: Jonathan Helmus +Date: Wed Oct 10 09:48:13 2018 -0500 + + remove conda-forge from hi-rest install instructions + +commit 1ce41943e46b3db1200496f570e56773b7e9a796 +Merge: b61c4e0 353b90b +Author: Filipe +Date: Sun Oct 7 06:39:41 2018 -0300 + + Merge pull request #35 from ocefpaf/test_numpy + + Use numpy 1.14 + +commit 353b90bf9878a7c65c33fab8b81f632fce65ec09 +Author: Filipe Fernandes +Date: Sat Oct 6 13:30:29 2018 -0300 + + test newer numpy + +commit b61c4e07cb599863a53d19057f00c48fe8cddf73 +Merge: ba57e51 284f24c +Author: Filipe +Date: Mon Oct 1 11:39:38 2018 -0300 + + Merge pull request #34 from ocefpaf/update_to_v1.2.0 + + Update to v1.2.0 + +commit 284f24c7f0b5226e594944f8d080ec1d14ade462 +Author: Filipe Fernandes +Date: Fri Sep 28 09:50:15 2018 -0300 + + MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.09.11 + +commit f93747c1145c1d8a21182207c8946383be0c6d0c +Author: Filipe Fernandes +Date: Fri Sep 28 09:39:08 2018 -0300 + + update to 1.2.0 + +commit 3b8ccbe83be4f61f07e01ecf0ae6f7619e3b435a +Author: Filipe Fernandes +Date: Thu Sep 27 20:15:23 2018 -0300 + + py37 + +commit ba57e5198e035c1f3567313ec3a7e0a07432f315 +Merge: 76a2d96 f9a9b2c +Author: Filipe +Date: Wed Sep 26 07:54:24 2018 -0300 + + Merge pull request #32 from ReimarBauer/master + + fixes #31 by applying the is_scalar patch + +commit f9a9b2ccbe5bbe922c8964a694a584c5b7b8c0b2 +Author: Filipe +Date: Tue Sep 25 13:59:23 2018 -0300 + + Update meta.yaml + +commit b86fe8264f5e4bcd774111c389e9ff2b7c5b5d76 +Author: Reimar Bauer +Date: Tue Sep 25 16:20:00 2018 +0200 + + language typo fixed + +commit 0c63e5fdf56c3216f0209b7c43145d6225fc4115 +Author: Reimar Bauer +Date: Tue Sep 25 16:18:05 2018 +0200 + + removes import of is_skalar, https://github.com/matplotlib/basemap/pull/398/files + +commit 76a2d96fe44e0c4a4ec217f069bdc3cbd358cc6a +Merge: e764a90 5fb7499 +Author: Filipe +Date: Fri Aug 31 17:54:16 2018 -0300 + + Merge pull request #29 from ocefpaf/py37 + + Py37 + +commit 5fb74999dfd348ed61d1dfb0afe61282505ee6c3 +Author: Filipe Fernandes +Date: Fri Aug 31 17:12:07 2018 -0300 + + don't build py27+win + +commit 2c8a4a9670887aea4bd4dfcdad5da8df21592218 +Author: Filipe Fernandes +Date: Fri Aug 31 13:19:47 2018 -0300 + + patch proj dir + +commit 4e07e95d45e5d511f28139cd3433ed5428f5cecf +Author: Filipe Fernandes +Date: Fri Aug 31 11:15:17 2018 -0300 + + 1.14 and up + +commit 2a084d9df1b60b48c889f9ae196190621e6ba1a5 +Author: Filipe Fernandes +Date: Fri Aug 31 09:52:00 2018 -0300 + + use cython + +commit fc09a3f520d56704caa8328e17ead40d1e934624 +Author: Filipe Fernandes +Date: Fri Aug 31 08:21:17 2018 -0300 + + MNT: Re-rendered with conda-smithy 3.1.12.post.dev2 and pinning 2018.08.28 + +commit 6e99297effde45754a07cce666a1738fb1c21e1b +Author: Filipe Fernandes +Date: Fri Aug 31 08:21:11 2018 -0300 + + py37 + +commit e764a900943206b9c3763921c95b6a8bf1f0ae3c +Merge: 39dbc7e ccb2a00 +Author: Filipe +Date: Mon Aug 13 16:11:11 2018 -0300 + + Merge pull request #28 from ocefpaf/update_recipe + + update recipe + +commit ccb2a00af844fabb735cf19ba0f1870893587368 +Author: Filipe Fernandes +Date: Mon Aug 13 15:43:54 2018 -0300 + + bump + +commit e339bf9faafda906b70061df8c394819bdb8d714 +Author: conda-forge-admin +Date: Mon Aug 13 18:41:10 2018 +0000 + + MNT: Re-rendered with conda-smithy 3.1.11 and pinning 2018.08.05 + +commit 3cf0fae2ff17feb716fd0f801a432d9adb553f1e +Author: Filipe Fernandes +Date: Mon Aug 13 15:39:39 2018 -0300 + + update recipe + +commit 39dbc7ed972904cd5ac1c202f3830dd696f7d288 +Author: Travis CI User +Date: Sat Aug 4 17:02:34 2018 +0000 + + [ci skip] [skip ci] Update anaconda token + +commit 0b874828d0fbca46f2f06c4188759adba2b9bccc +Merge: 31a12c4 a007127 +Author: Filipe +Date: Mon Feb 12 13:22:33 2018 -0800 + + Merge pull request #26 from ocefpaf/backport_386 + + Backport 386 + +commit a00712761d36c247ed1a3b44f2c1f8e2d58560f4 +Author: Filipe Fernandes +Date: Mon Feb 12 10:48:54 2018 -0800 + + backport PR 386 + +commit 8119ca1c34d46512ed4503b37f9312033891c102 +Author: Filipe Fernandes +Date: Mon Feb 12 10:48:42 2018 -0800 + + rerender + +commit 31a12c42c296cf3662bc0cd70c9e2c7d9e968c31 +Merge: bf68455 2373f48 +Author: Filipe +Date: Fri Nov 3 08:56:23 2017 -0200 + + Merge pull request #23 from ocefpaf/pin_geos + + Pin geos + +commit 2373f48ac48862b886690cb0ebfad23d79b75cb4 +Author: Filipe Fernandes +Date: Thu Nov 2 15:04:11 2017 -0200 + + pin geos to 3.6.2 + +commit 75554f65db24720d0f58cf21baa1683ac86b752e +Author: Filipe Fernandes +Date: Thu Nov 2 15:04:04 2017 -0200 + + rerender + +commit bf68455a83c45d803871dbce4fbc516a86366ce6 +Author: Travis-CI on github.com/conda-forge/staged-recipes +Date: Sat Aug 26 19:15:39 2017 +0000 + + [ci skip] [skip ci] Update anaconda token + +commit fff3fa5feb88acc8aeb4e5f72456e1fdd5eb5434 +Merge: 20fbb55 59aabf7 +Author: Filipe +Date: Thu Jul 27 12:04:01 2017 -0300 + + Merge pull request #21 from ocefpaf/sane_numpy + + Sane numpy + +commit 59aabf7fccf8943ec8dc6cbf6fd12419f314f7c6 +Author: Filipe Fernandes +Date: Thu Jul 27 10:22:14 2017 -0300 + + rerender with auto + +commit ea4ec95efd51388d07237bde19c7def84af70f87 +Author: Filipe Fernandes +Date: Thu Jul 27 10:22:11 2017 -0300 + + sane numpy matrix + +commit 20fbb5504faa21f4069f162adb20f67578d42212 +Merge: 21a7978 cf28a9e +Author: Filipe +Date: Tue Jun 20 21:41:32 2017 -0300 + + Merge pull request #20 from ocefpaf/np113 + + numpy 1.13 + +commit cf28a9ea389ac2cc892167c0f2bf4ad035c4fa63 +Author: ocefpaf +Date: Tue Jun 20 18:36:43 2017 -0300 + + numpy 1.13 + +commit 21a7978c2bff3b3a5896c1250def305afed823a3 +Merge: 3aae205 a289add +Author: Filipe +Date: Tue Jun 6 14:56:01 2017 -0300 + + Merge pull request #19 from ocefpaf/pin_geos + + fix geos pin + +commit a289add1d2607f93227d4d27069ab705de72fcd9 +Author: ocefpaf +Date: Tue Jun 6 12:05:17 2017 -0300 + + fix geos pin + +commit 3aae2058cbf308668c30a7eff0b3c527fce8b8ee +Merge: d45f208 772c820 +Author: Filipe +Date: Thu May 4 21:46:43 2017 -0300 + + Merge pull request #18 from ocefpaf/update_to_1.1.0 + + Update to 1.1.0 + +commit 772c8204d9bcf834345da06576c0b548eca23896 +Author: ocefpaf +Date: Thu May 4 15:34:41 2017 -0300 + + Update to 1.1.0 + +commit 7bc2f62d76f052278a75167838c6ca637eaf60be +Author: ocefpaf +Date: Thu May 4 15:34:39 2017 -0300 + + rerender with auto + +commit d45f208698048d591391c2ce0792be9dcf82f44f +Merge: ceb7dbf 2c121b9 +Author: Filipe +Date: Tue Mar 28 07:37:04 2017 -0300 + + Merge pull request #17 from ocefpaf/rerender + + rerender with auto + +commit 2c121b9df120627f0cacd82ebf35d1687ad7d954 +Author: ocefpaf +Date: Mon Mar 27 15:36:48 2017 -0300 + + rerender with auto + +commit ceb7dbf7a6c9466aa4e79d9d745979c29e673d6d +Merge: 09edc67 ed27861 +Author: Filipe +Date: Fri Feb 10 13:12:49 2017 -0300 + + Merge pull request #16 from ocefpaf/rerender + + re-render with auto + +commit ed2786177b33f05a0c4edfb0ce429f54cde5f460 +Author: ocefpaf +Date: Fri Feb 10 10:43:05 2017 -0300 + + re-render with auto + +commit 09edc67369a53d65111fc216b39e9295f8812ebd +Merge: b07043c ad52816 +Author: Filipe +Date: Sat Jan 14 20:33:45 2017 -0300 + + Merge pull request #14 from ocefpaf/rerender + + rerender with auto + +commit ad528165e9ccd20645eb5b732ce41df6ae156dd2 +Author: ocefpaf +Date: Sat Jan 14 15:17:02 2017 -0300 + + rerender with auto + +commit b07043cc3624f8e7f796b1c0612aeaa2326be06a +Merge: 6c59814 c3f25de +Author: Filipe +Date: Thu Jan 12 07:52:35 2017 -0300 + + Merge pull request #13 from ocefpaf/py36 + + rerender with auto + +commit c3f25de99b6d7eea4012962d8d2c5f969164f4e8 +Author: ocefpaf +Date: Wed Jan 11 13:07:20 2017 -0300 + + rerender with auto + +commit 6c59814682b60754a8e005ec3accf3c050a83197 +Merge: e54af5b 172dae2 +Author: jakirkham +Date: Fri Dec 30 18:15:27 2016 -0500 + + Merge pull request #12 from conda-forge-admin/feedstock_rerender_master + + MNT: Re-render the feedstock [ci skip] + +commit 172dae249aedd7232614ab9a9e765cf268626596 +Author: conda-forge-admin +Date: Mon Dec 19 01:35:13 2016 +0000 + + MNT: Updated the feedstock for conda-smithy version 1.7.0. + +commit e54af5b6d3182c6f18f9542608eb17126284f524 +Merge: 7320d7c d027dab +Author: Filipe +Date: Mon Nov 14 22:13:35 2016 -0300 + + Merge pull request #10 from ocefpaf/test_geos_351 + + Test geos 351 + +commit d027dabc267391537c82afa5c90b9ab68ac6bf8f +Author: ocefpaf +Date: Mon Nov 14 14:39:20 2016 -0300 + + rerender + +commit 4854f728857c20fa4c30133952df540e214d825d +Author: ocefpaf +Date: Mon Nov 14 14:39:17 2016 -0300 + + Test geos 3.5.* + +commit 7320d7cdddbe1faa687e6c90b0be3e6371d84d46 +Merge: 3d0edde 9f21724 +Author: Filipe +Date: Sun Oct 9 20:04:17 2016 -0300 + + Merge pull request #9 from ocefpaf/refresh + + Refresh + +commit 9f2172459a3788bc14a6ef0c3fb76d7b5dadea37 +Author: ocefpaf +Date: Sun Oct 9 11:23:36 2016 -0300 + + Update to latest commit + +commit 120dd059f89a204830a48fcdaa8b5ad46ba9db91 +Author: ocefpaf +Date: Sun Oct 9 11:23:23 2016 -0300 + + rerender + +commit 3d0edde395a58a1c678be4824b966763582734ec +Merge: 2e6d90e d6d9fd6 +Author: Phil Elson +Date: Sat Oct 1 06:41:14 2016 +0100 + + Merge pull request #7 from conda-forge-admin/feedstock_rerender_master + + MNT: Update build/test environment name + +commit d6d9fd6e1d0bc37a34d1b7f3cb426dff0366cb6a +Author: conda-forge-admin +Date: Thu Sep 15 12:13:07 2016 +0100 + + MNT: Replace hard-coded build/test environment name with general PREFIX form. + + [ci skip] + +commit 2e6d90eed0df15d31479a14b725fd7ad50702d9c +Merge: 263b624 05c9305 +Author: Filipe +Date: Sat Jul 30 13:32:51 2016 -0300 + + Merge pull request #6 from ocefpaf/pin_geos + + Pin geos + +commit 05c93056f3208991d10008ef1bf1eb8d2a8f7862 +Author: ocefpaf +Date: Sat Jul 30 12:41:41 2016 -0300 + + rerender + +commit 3afe3655bab52a488c9d5598b6d6613eaab6580e +Author: ocefpaf +Date: Sat Jul 30 12:39:15 2016 -0300 + + Pin geos + +commit 263b6241883d91122397b09bb345019f4e685bad +Merge: d81ce3f 6d2aed0 +Author: Filipe +Date: Tue May 17 08:54:18 2016 -0300 + + Merge pull request #5 from conda-forge-admin/feedstock_rerender_master + + MNT: Re-render the feedstock + +commit 6d2aed0e6767cad643f11cfb37de94e502759d80 +Author: conda-forge-admin +Date: Tue May 17 04:45:04 2016 +0000 + + MNT: Updated the feedstock for conda-smithy version 0.10.3. + + [ci skip] + +commit d81ce3fe952d188ae16ad7cbb77eda0b4f282a5d +Merge: 83a017d 335cc6a +Author: Filipe +Date: Wed Apr 13 15:54:51 2016 -0300 + + Merge pull request #4 from ocefpaf/rerender + + rerender + +commit 335cc6a5fb97ae870551d89e7ac416ba9f973112 +Author: ocefpaf +Date: Wed Apr 13 14:01:36 2016 -0300 + + rerender + +commit 83a017dd527cf5a48ecc3df18dc28b0b2134d3ea +Merge: 77d8499 9fed35d +Author: Filipe +Date: Sun Mar 27 07:48:36 2016 -0300 + + Merge pull request #3 from ocefpaf/pep0440_version + + Testing pep0440 version. + +commit 9fed35d69c7eb64a6fac3bc22a04928881ff4916 +Author: ocefpaf +Date: Sun Mar 27 07:39:47 2016 -0300 + + [ci skip] + +commit fde54c7715acdfd03e827b16245d0de6499eba2e +Author: ocefpaf +Date: Sat Mar 26 15:35:29 2016 -0300 + + Testing pep0440 version. + +commit 77d8499d33b2c3d9039363d95ca613e634721e37 +Merge: aa04db1 44fd553 +Author: Filipe +Date: Sat Mar 26 10:25:03 2016 -0300 + + Merge pull request #2 from ocefpaf/pin_conda-build + + pin conda-build to 1.18.2 + +commit 44fd553b27f8ec4057e25b17cc90e5518fc96e60 +Author: ocefpaf +Date: Sat Mar 26 10:07:05 2016 -0300 + + pin conda-build to 1.18.2 + +commit aa04db1d11c46124f7cb6435d4bb4b259a8a0682 +Author: Travis-CI on github.com/conda-forge/staged-recipes +Date: Fri Mar 25 17:47:37 2016 +0000 + + Re-render the feedstock after CI registration. + +commit 2290f22eefe7c04abd361ca309bd82d08af950c3 +Author: Travis-CI on github.com/conda-forge/staged-recipes +Date: Fri Mar 25 17:47:03 2016 +0000 + + Initial commit of the basemap feedstock. From 57a41140c3cb6c63008319e4eb98c46687614358 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Wed, 22 Dec 2021 10:30:48 +0000 Subject: [PATCH 36/56] Add ignore_run_exports: proj --- recipe/meta.yaml | 2 + recipe/recipe_log.txt | 705 ------------------------------------------ 2 files changed, 2 insertions(+), 705 deletions(-) delete mode 100644 recipe/recipe_log.txt diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7470a5d..22f878b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,8 @@ build: # This package isn't included to the SOW Packages list skip: True # [linux and s390x] skip: True # [win and py2k] + ignore_run_exports: + - proj requirements: build: diff --git a/recipe/recipe_log.txt b/recipe/recipe_log.txt deleted file mode 100644 index 9d2402d..0000000 --- a/recipe/recipe_log.txt +++ /dev/null @@ -1,705 +0,0 @@ -commit ddb1cea4201f07d93bd03e02f103b8890a1521a8 -Author: Serhii Kupriienko -Date: Wed Dec 22 10:16:36 2021 +0000 - - Add license_family, dev_url, pip check - -commit dd5c17e525523b657afe1da1001e106dfc368695 -Author: Kai Tietz -Date: Thu Aug 26 11:27:33 2021 +0200 - - adjust old patch for historical reason - -commit b8545f24b712fbdec83fea48d2a86b0fcbc60aab -Author: Kai Tietz -Date: Thu Aug 26 11:26:39 2021 +0200 - - bump build number - -commit 30bfe23a8a0dc26a4b0ab0d3a2d06b665e7bc678 -Author: Kai Tietz -Date: Thu Aug 26 09:31:30 2021 +0200 - - Fix basemap and store as 1.2.2 (synchronize with CF) - -commit 7fcd951cb0278ff829e9283725a9b6d1e136491b -Author: Kai Tietz -Date: Wed May 27 12:00:49 2020 +0200 - - Reset build number - -commit 7d711b893a00a2008549e494bc7fa4e5aaca40bb -Author: Matthew R Becker -Date: Mon May 18 06:45:54 2020 -0500 - - [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration CondaForgeAutomerge - -commit 357689b46ecbc3457404dc9b1947b5608eaf7727 -Author: regro-cf-autotick-bot -Date: Wed Apr 8 18:51:51 2020 +0000 - - Rebuild for proj700 - -commit 7fea6caca7a1982bfd889a9373eb78fab2f1e57c -Author: regro-cf-autotick-bot -Date: Thu Mar 12 16:49:04 2020 +0000 - - MNT: Re-rendered with conda-build 3.19.0, conda-smithy 3.6.12, and conda-forge-pinning 2020.03.10 - -commit 0fc4693f4f9f1288b62de089783320d04b2322db -Author: regro-cf-autotick-bot -Date: Thu Mar 12 16:48:39 2020 +0000 - - Rebuild for geos-3.8.1 - -commit 2539f7adb4b77a9d17764ce2b9c931d001ffe596 -Author: Filipe Fernandes -Date: Thu Mar 12 13:29:04 2020 -0300 - - clean ups - -commit 5558346d9508bf27d8195621faa2829bcdcab21b -Author: Filipe Fernandes -Date: Thu Mar 12 12:44:14 2020 -0300 - - use commit that updates proj - -commit 1852ea05ac92ead09585d9abd74189624c2b4bf5 -Author: conda-forge-admin -Date: Mon Mar 2 15:27:57 2020 +0000 - - [ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration AutomergeAndRerender - -commit 3680855aff3fae29965950499f0a7003b12c2c84 -Author: regro-cf-autotick-bot -Date: Wed Nov 27 22:25:19 2019 +0000 - - bump build number - -commit 8733005fab048120c6665577eb807087781ee361 -Author: regro-cf-autotick-bot -Date: Mon Nov 4 13:25:40 2019 +0000 - - bump build number - -commit 364a23399ca2b4b2f6e8f7a0d12901ec43d65830 -Author: regro-cf-autotick-bot -Date: Tue Aug 13 17:34:10 2019 +0000 - - bump build number - -commit d8ebb19299b2d3367aba166cea263372ed3cffd9 -Author: regro-cf-autotick-bot -Date: Thu Aug 8 01:26:39 2019 +0000 - - MNT: Re-rendered with conda-build 3.18.9, conda-smithy 3.4.1, and conda-forge-pinning 2019.07.26 - -commit e7840205d697a52880b7f42107174c20174e6110 -Author: regro-cf-autotick-bot -Date: Thu Aug 8 01:26:26 2019 +0000 - - updated v1.2.1 - -commit fa99cb93450224078dba4ee76d36cd89b61359ee -Author: regro-cf-autotick-bot -Date: Sun Jul 7 23:28:22 2019 +0000 - - MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.4.0, and conda-forge-pinning 2019.07.04 - -commit caa5181459e6dbe5b65bc185090a3d0cdb0bf0c6 -Author: regro-cf-autotick-bot -Date: Sun Jul 7 23:28:10 2019 +0000 - - bump build number - -commit a1b2b31dea27d551eaba7161d1f1faf43e038a40 -Author: Filipe Fernandes -Date: Sun May 26 14:58:52 2019 -0300 - - MNT: Re-rendered with conda-build 3.18.1, conda-smithy 3.3.4, and conda-forge-pinning 2019.05.26 - -commit 38c3023e946c9276c83ffd1b62b124dd69a7a67f -Author: Filipe Fernandes -Date: Sun May 26 14:58:15 2019 -0300 - - use mpl base - -commit 2d22e1731f2f1ee989ddbbfbbbbdeff6987cb7ba -Author: Filipe Fernandes -Date: Sat Mar 9 08:42:06 2019 -0300 - - MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and conda-forge-pinning 2019.02.24 - -commit cbce7fba9cdd9af0cb6d2d50ff0fb350545565f9 -Author: Filipe Fernandes -Date: Sat Mar 9 08:42:01 2019 -0300 - - pin pyproj - -commit cffdb7d7ebb1485cacec79af1540c2b3d5ba66b0 -Author: Marius van Niekerk -Date: Sat Jan 19 19:57:54 2019 -0500 - - Update meta.yaml - -commit ca37f851bebc51ee17d1a3c06d05a1fc5bf1845b -Author: conda-forge-admin -Date: Sun Jan 20 00:38:29 2019 +0000 - - MNT: Re-rendered with conda-build 3.17.5, conda-smithy 3.2.9, and conda-forge-pinning 2019.01.18 - -commit bde86a25e31aa66f91ad1c01408675c7ea6d108b -Author: conda-forge-admin -Date: Tue Oct 30 01:58:41 2018 +0000 - - MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.16 - -commit 7397d94b5cbd6e0d8f2a6ed8c73d0d4d7a719637 -Author: Filipe -Date: Mon Oct 29 22:57:50 2018 -0300 - - Update meta.yaml - -commit df1c7ded72d5a64081498c5da37437e49af80843 -Author: regro-cf-autotick-bot -Date: Tue Oct 30 01:15:31 2018 +0000 - - MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.10.16 - -commit e2aa5c2730cdda0e81ed384389aa9a920e5bf893 -Author: regro-cf-autotick-bot -Date: Tue Oct 30 01:15:26 2018 +0000 - - bump build number - -commit ee1455cdb540f9ddcbf1cff60b2769fff2b7fc43 -Author: Jonathan Helmus -Date: Wed Oct 10 09:49:50 2018 -0500 - - use setuptools for install on windows - -commit d6f2b8e03e8ddcd213f2227e3aaf99963c0b6cc7 -Author: Jonathan Helmus -Date: Wed Oct 10 09:49:41 2018 -0500 - - remote --no-cache-dir - -commit a008555d5dafb30e2dada9ad132fa8c7facd6985 -Author: Jonathan Helmus -Date: Wed Oct 10 09:48:40 2018 -0500 - - add descriptions to about section - -commit e04b3fd591799e8192e8dcdede9960e0e65c3874 -Author: Jonathan Helmus -Date: Wed Oct 10 09:48:28 2018 -0500 - - enable windows py27 build - -commit d3601e47709ca686c2e16587cf7271782ee70056 -Author: Jonathan Helmus -Date: Wed Oct 10 09:48:13 2018 -0500 - - remove conda-forge from hi-rest install instructions - -commit 1ce41943e46b3db1200496f570e56773b7e9a796 -Merge: b61c4e0 353b90b -Author: Filipe -Date: Sun Oct 7 06:39:41 2018 -0300 - - Merge pull request #35 from ocefpaf/test_numpy - - Use numpy 1.14 - -commit 353b90bf9878a7c65c33fab8b81f632fce65ec09 -Author: Filipe Fernandes -Date: Sat Oct 6 13:30:29 2018 -0300 - - test newer numpy - -commit b61c4e07cb599863a53d19057f00c48fe8cddf73 -Merge: ba57e51 284f24c -Author: Filipe -Date: Mon Oct 1 11:39:38 2018 -0300 - - Merge pull request #34 from ocefpaf/update_to_v1.2.0 - - Update to v1.2.0 - -commit 284f24c7f0b5226e594944f8d080ec1d14ade462 -Author: Filipe Fernandes -Date: Fri Sep 28 09:50:15 2018 -0300 - - MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.09.11 - -commit f93747c1145c1d8a21182207c8946383be0c6d0c -Author: Filipe Fernandes -Date: Fri Sep 28 09:39:08 2018 -0300 - - update to 1.2.0 - -commit 3b8ccbe83be4f61f07e01ecf0ae6f7619e3b435a -Author: Filipe Fernandes -Date: Thu Sep 27 20:15:23 2018 -0300 - - py37 - -commit ba57e5198e035c1f3567313ec3a7e0a07432f315 -Merge: 76a2d96 f9a9b2c -Author: Filipe -Date: Wed Sep 26 07:54:24 2018 -0300 - - Merge pull request #32 from ReimarBauer/master - - fixes #31 by applying the is_scalar patch - -commit f9a9b2ccbe5bbe922c8964a694a584c5b7b8c0b2 -Author: Filipe -Date: Tue Sep 25 13:59:23 2018 -0300 - - Update meta.yaml - -commit b86fe8264f5e4bcd774111c389e9ff2b7c5b5d76 -Author: Reimar Bauer -Date: Tue Sep 25 16:20:00 2018 +0200 - - language typo fixed - -commit 0c63e5fdf56c3216f0209b7c43145d6225fc4115 -Author: Reimar Bauer -Date: Tue Sep 25 16:18:05 2018 +0200 - - removes import of is_skalar, https://github.com/matplotlib/basemap/pull/398/files - -commit 76a2d96fe44e0c4a4ec217f069bdc3cbd358cc6a -Merge: e764a90 5fb7499 -Author: Filipe -Date: Fri Aug 31 17:54:16 2018 -0300 - - Merge pull request #29 from ocefpaf/py37 - - Py37 - -commit 5fb74999dfd348ed61d1dfb0afe61282505ee6c3 -Author: Filipe Fernandes -Date: Fri Aug 31 17:12:07 2018 -0300 - - don't build py27+win - -commit 2c8a4a9670887aea4bd4dfcdad5da8df21592218 -Author: Filipe Fernandes -Date: Fri Aug 31 13:19:47 2018 -0300 - - patch proj dir - -commit 4e07e95d45e5d511f28139cd3433ed5428f5cecf -Author: Filipe Fernandes -Date: Fri Aug 31 11:15:17 2018 -0300 - - 1.14 and up - -commit 2a084d9df1b60b48c889f9ae196190621e6ba1a5 -Author: Filipe Fernandes -Date: Fri Aug 31 09:52:00 2018 -0300 - - use cython - -commit fc09a3f520d56704caa8328e17ead40d1e934624 -Author: Filipe Fernandes -Date: Fri Aug 31 08:21:17 2018 -0300 - - MNT: Re-rendered with conda-smithy 3.1.12.post.dev2 and pinning 2018.08.28 - -commit 6e99297effde45754a07cce666a1738fb1c21e1b -Author: Filipe Fernandes -Date: Fri Aug 31 08:21:11 2018 -0300 - - py37 - -commit e764a900943206b9c3763921c95b6a8bf1f0ae3c -Merge: 39dbc7e ccb2a00 -Author: Filipe -Date: Mon Aug 13 16:11:11 2018 -0300 - - Merge pull request #28 from ocefpaf/update_recipe - - update recipe - -commit ccb2a00af844fabb735cf19ba0f1870893587368 -Author: Filipe Fernandes -Date: Mon Aug 13 15:43:54 2018 -0300 - - bump - -commit e339bf9faafda906b70061df8c394819bdb8d714 -Author: conda-forge-admin -Date: Mon Aug 13 18:41:10 2018 +0000 - - MNT: Re-rendered with conda-smithy 3.1.11 and pinning 2018.08.05 - -commit 3cf0fae2ff17feb716fd0f801a432d9adb553f1e -Author: Filipe Fernandes -Date: Mon Aug 13 15:39:39 2018 -0300 - - update recipe - -commit 39dbc7ed972904cd5ac1c202f3830dd696f7d288 -Author: Travis CI User -Date: Sat Aug 4 17:02:34 2018 +0000 - - [ci skip] [skip ci] Update anaconda token - -commit 0b874828d0fbca46f2f06c4188759adba2b9bccc -Merge: 31a12c4 a007127 -Author: Filipe -Date: Mon Feb 12 13:22:33 2018 -0800 - - Merge pull request #26 from ocefpaf/backport_386 - - Backport 386 - -commit a00712761d36c247ed1a3b44f2c1f8e2d58560f4 -Author: Filipe Fernandes -Date: Mon Feb 12 10:48:54 2018 -0800 - - backport PR 386 - -commit 8119ca1c34d46512ed4503b37f9312033891c102 -Author: Filipe Fernandes -Date: Mon Feb 12 10:48:42 2018 -0800 - - rerender - -commit 31a12c42c296cf3662bc0cd70c9e2c7d9e968c31 -Merge: bf68455 2373f48 -Author: Filipe -Date: Fri Nov 3 08:56:23 2017 -0200 - - Merge pull request #23 from ocefpaf/pin_geos - - Pin geos - -commit 2373f48ac48862b886690cb0ebfad23d79b75cb4 -Author: Filipe Fernandes -Date: Thu Nov 2 15:04:11 2017 -0200 - - pin geos to 3.6.2 - -commit 75554f65db24720d0f58cf21baa1683ac86b752e -Author: Filipe Fernandes -Date: Thu Nov 2 15:04:04 2017 -0200 - - rerender - -commit bf68455a83c45d803871dbce4fbc516a86366ce6 -Author: Travis-CI on github.com/conda-forge/staged-recipes -Date: Sat Aug 26 19:15:39 2017 +0000 - - [ci skip] [skip ci] Update anaconda token - -commit fff3fa5feb88acc8aeb4e5f72456e1fdd5eb5434 -Merge: 20fbb55 59aabf7 -Author: Filipe -Date: Thu Jul 27 12:04:01 2017 -0300 - - Merge pull request #21 from ocefpaf/sane_numpy - - Sane numpy - -commit 59aabf7fccf8943ec8dc6cbf6fd12419f314f7c6 -Author: Filipe Fernandes -Date: Thu Jul 27 10:22:14 2017 -0300 - - rerender with auto - -commit ea4ec95efd51388d07237bde19c7def84af70f87 -Author: Filipe Fernandes -Date: Thu Jul 27 10:22:11 2017 -0300 - - sane numpy matrix - -commit 20fbb5504faa21f4069f162adb20f67578d42212 -Merge: 21a7978 cf28a9e -Author: Filipe -Date: Tue Jun 20 21:41:32 2017 -0300 - - Merge pull request #20 from ocefpaf/np113 - - numpy 1.13 - -commit cf28a9ea389ac2cc892167c0f2bf4ad035c4fa63 -Author: ocefpaf -Date: Tue Jun 20 18:36:43 2017 -0300 - - numpy 1.13 - -commit 21a7978c2bff3b3a5896c1250def305afed823a3 -Merge: 3aae205 a289add -Author: Filipe -Date: Tue Jun 6 14:56:01 2017 -0300 - - Merge pull request #19 from ocefpaf/pin_geos - - fix geos pin - -commit a289add1d2607f93227d4d27069ab705de72fcd9 -Author: ocefpaf -Date: Tue Jun 6 12:05:17 2017 -0300 - - fix geos pin - -commit 3aae2058cbf308668c30a7eff0b3c527fce8b8ee -Merge: d45f208 772c820 -Author: Filipe -Date: Thu May 4 21:46:43 2017 -0300 - - Merge pull request #18 from ocefpaf/update_to_1.1.0 - - Update to 1.1.0 - -commit 772c8204d9bcf834345da06576c0b548eca23896 -Author: ocefpaf -Date: Thu May 4 15:34:41 2017 -0300 - - Update to 1.1.0 - -commit 7bc2f62d76f052278a75167838c6ca637eaf60be -Author: ocefpaf -Date: Thu May 4 15:34:39 2017 -0300 - - rerender with auto - -commit d45f208698048d591391c2ce0792be9dcf82f44f -Merge: ceb7dbf 2c121b9 -Author: Filipe -Date: Tue Mar 28 07:37:04 2017 -0300 - - Merge pull request #17 from ocefpaf/rerender - - rerender with auto - -commit 2c121b9df120627f0cacd82ebf35d1687ad7d954 -Author: ocefpaf -Date: Mon Mar 27 15:36:48 2017 -0300 - - rerender with auto - -commit ceb7dbf7a6c9466aa4e79d9d745979c29e673d6d -Merge: 09edc67 ed27861 -Author: Filipe -Date: Fri Feb 10 13:12:49 2017 -0300 - - Merge pull request #16 from ocefpaf/rerender - - re-render with auto - -commit ed2786177b33f05a0c4edfb0ce429f54cde5f460 -Author: ocefpaf -Date: Fri Feb 10 10:43:05 2017 -0300 - - re-render with auto - -commit 09edc67369a53d65111fc216b39e9295f8812ebd -Merge: b07043c ad52816 -Author: Filipe -Date: Sat Jan 14 20:33:45 2017 -0300 - - Merge pull request #14 from ocefpaf/rerender - - rerender with auto - -commit ad528165e9ccd20645eb5b732ce41df6ae156dd2 -Author: ocefpaf -Date: Sat Jan 14 15:17:02 2017 -0300 - - rerender with auto - -commit b07043cc3624f8e7f796b1c0612aeaa2326be06a -Merge: 6c59814 c3f25de -Author: Filipe -Date: Thu Jan 12 07:52:35 2017 -0300 - - Merge pull request #13 from ocefpaf/py36 - - rerender with auto - -commit c3f25de99b6d7eea4012962d8d2c5f969164f4e8 -Author: ocefpaf -Date: Wed Jan 11 13:07:20 2017 -0300 - - rerender with auto - -commit 6c59814682b60754a8e005ec3accf3c050a83197 -Merge: e54af5b 172dae2 -Author: jakirkham -Date: Fri Dec 30 18:15:27 2016 -0500 - - Merge pull request #12 from conda-forge-admin/feedstock_rerender_master - - MNT: Re-render the feedstock [ci skip] - -commit 172dae249aedd7232614ab9a9e765cf268626596 -Author: conda-forge-admin -Date: Mon Dec 19 01:35:13 2016 +0000 - - MNT: Updated the feedstock for conda-smithy version 1.7.0. - -commit e54af5b6d3182c6f18f9542608eb17126284f524 -Merge: 7320d7c d027dab -Author: Filipe -Date: Mon Nov 14 22:13:35 2016 -0300 - - Merge pull request #10 from ocefpaf/test_geos_351 - - Test geos 351 - -commit d027dabc267391537c82afa5c90b9ab68ac6bf8f -Author: ocefpaf -Date: Mon Nov 14 14:39:20 2016 -0300 - - rerender - -commit 4854f728857c20fa4c30133952df540e214d825d -Author: ocefpaf -Date: Mon Nov 14 14:39:17 2016 -0300 - - Test geos 3.5.* - -commit 7320d7cdddbe1faa687e6c90b0be3e6371d84d46 -Merge: 3d0edde 9f21724 -Author: Filipe -Date: Sun Oct 9 20:04:17 2016 -0300 - - Merge pull request #9 from ocefpaf/refresh - - Refresh - -commit 9f2172459a3788bc14a6ef0c3fb76d7b5dadea37 -Author: ocefpaf -Date: Sun Oct 9 11:23:36 2016 -0300 - - Update to latest commit - -commit 120dd059f89a204830a48fcdaa8b5ad46ba9db91 -Author: ocefpaf -Date: Sun Oct 9 11:23:23 2016 -0300 - - rerender - -commit 3d0edde395a58a1c678be4824b966763582734ec -Merge: 2e6d90e d6d9fd6 -Author: Phil Elson -Date: Sat Oct 1 06:41:14 2016 +0100 - - Merge pull request #7 from conda-forge-admin/feedstock_rerender_master - - MNT: Update build/test environment name - -commit d6d9fd6e1d0bc37a34d1b7f3cb426dff0366cb6a -Author: conda-forge-admin -Date: Thu Sep 15 12:13:07 2016 +0100 - - MNT: Replace hard-coded build/test environment name with general PREFIX form. - - [ci skip] - -commit 2e6d90eed0df15d31479a14b725fd7ad50702d9c -Merge: 263b624 05c9305 -Author: Filipe -Date: Sat Jul 30 13:32:51 2016 -0300 - - Merge pull request #6 from ocefpaf/pin_geos - - Pin geos - -commit 05c93056f3208991d10008ef1bf1eb8d2a8f7862 -Author: ocefpaf -Date: Sat Jul 30 12:41:41 2016 -0300 - - rerender - -commit 3afe3655bab52a488c9d5598b6d6613eaab6580e -Author: ocefpaf -Date: Sat Jul 30 12:39:15 2016 -0300 - - Pin geos - -commit 263b6241883d91122397b09bb345019f4e685bad -Merge: d81ce3f 6d2aed0 -Author: Filipe -Date: Tue May 17 08:54:18 2016 -0300 - - Merge pull request #5 from conda-forge-admin/feedstock_rerender_master - - MNT: Re-render the feedstock - -commit 6d2aed0e6767cad643f11cfb37de94e502759d80 -Author: conda-forge-admin -Date: Tue May 17 04:45:04 2016 +0000 - - MNT: Updated the feedstock for conda-smithy version 0.10.3. - - [ci skip] - -commit d81ce3fe952d188ae16ad7cbb77eda0b4f282a5d -Merge: 83a017d 335cc6a -Author: Filipe -Date: Wed Apr 13 15:54:51 2016 -0300 - - Merge pull request #4 from ocefpaf/rerender - - rerender - -commit 335cc6a5fb97ae870551d89e7ac416ba9f973112 -Author: ocefpaf -Date: Wed Apr 13 14:01:36 2016 -0300 - - rerender - -commit 83a017dd527cf5a48ecc3df18dc28b0b2134d3ea -Merge: 77d8499 9fed35d -Author: Filipe -Date: Sun Mar 27 07:48:36 2016 -0300 - - Merge pull request #3 from ocefpaf/pep0440_version - - Testing pep0440 version. - -commit 9fed35d69c7eb64a6fac3bc22a04928881ff4916 -Author: ocefpaf -Date: Sun Mar 27 07:39:47 2016 -0300 - - [ci skip] - -commit fde54c7715acdfd03e827b16245d0de6499eba2e -Author: ocefpaf -Date: Sat Mar 26 15:35:29 2016 -0300 - - Testing pep0440 version. - -commit 77d8499d33b2c3d9039363d95ca613e634721e37 -Merge: aa04db1 44fd553 -Author: Filipe -Date: Sat Mar 26 10:25:03 2016 -0300 - - Merge pull request #2 from ocefpaf/pin_conda-build - - pin conda-build to 1.18.2 - -commit 44fd553b27f8ec4057e25b17cc90e5518fc96e60 -Author: ocefpaf -Date: Sat Mar 26 10:07:05 2016 -0300 - - pin conda-build to 1.18.2 - -commit aa04db1d11c46124f7cb6435d4bb4b259a8a0682 -Author: Travis-CI on github.com/conda-forge/staged-recipes -Date: Fri Mar 25 17:47:37 2016 +0000 - - Re-render the feedstock after CI registration. - -commit 2290f22eefe7c04abd361ca309bd82d08af950c3 -Author: Travis-CI on github.com/conda-forge/staged-recipes -Date: Fri Mar 25 17:47:03 2016 +0000 - - Initial commit of the basemap feedstock. From 4fd458f8574b18bc9a5b616c3a107ffbccff5c2a Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Wed, 22 Dec 2021 10:37:39 +0000 Subject: [PATCH 37/56] Add missing pacakges, reorder dependencies --- recipe/meta.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 22f878b..8cf4df8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,20 +26,22 @@ requirements: - patch # [not win] host: - python - - pip - cython - - numpy - geos - - pyproj + - numpy + - pip - proj + - pyproj + - setuptools + - wheel run: - python - {{ pin_compatible('numpy') }} - geos - matplotlib-base >=1.0.0,!=3.0.1 + - proj - pyproj >=1.9.3 - pyshp >=1.2.0 - - proj - six test: From 4a636cb7af95a3e2d53cfc356e2ec237064fc7d1 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 12:46:52 -0700 Subject: [PATCH 38/56] Changes: - Update from `1.2.2` to `1.3.1`. - Consolidate `basemap-data-hires-feedstock` into this recipe. - Break existing `basemap` package into 2: the executable (`basemap`) and the standard resolution data (`basemap-data`). - Bring `basemap-data` and `basemap-data-hires` data contents to parity with upstream packaging. - This also removes the packaging workaround for data. - Data moves from our workaround location to site-data. - Patches simplified since data is now in the default location. - Fix patch. - Update pins. --- recipe/bld-basemap.bat | 33 +++++ recipe/bld.bat | 30 ----- recipe/build-basemap.sh | 28 +++++ recipe/build.sh | 26 ---- recipe/data.patch | 61 --------- recipe/install_hires_instructions.patch | 13 ++ recipe/meta.yaml | 159 ++++++++++++++++-------- recipe/use_proj_data.patch | 12 -- 8 files changed, 183 insertions(+), 179 deletions(-) create mode 100644 recipe/bld-basemap.bat delete mode 100644 recipe/bld.bat create mode 100644 recipe/build-basemap.sh delete mode 100644 recipe/build.sh delete mode 100644 recipe/data.patch create mode 100644 recipe/install_hires_instructions.patch delete mode 100644 recipe/use_proj_data.patch diff --git a/recipe/bld-basemap.bat b/recipe/bld-basemap.bat new file mode 100644 index 0000000..bc75de0 --- /dev/null +++ b/recipe/bld-basemap.bat @@ -0,0 +1,33 @@ +ECHO "====================================================================================================" +ECHO "Building %PKG_NAME%" +ECHO "" + +:: Ensure our geos will be used. +set GEOS_DIR=%LIBRARY_PREFIX% + +:: Jump to the correct build section +if "%PKG_NAME"=="basemap" GOTO CASE_basemap +if "%PKG_NAME"=="basemap-data" GOTO CASE_basemap_data +if "%PKG_NAME"=="basemap-data-hires" GOTO CASE_basemap_data_hires + +ECHO "Unknown package: %PKG_NAME%" +EXIT 1 + + +:CASE_basemap + "%PYTHON%" -m pip install packages\basemap --no-deps --ignore-installed -vvv + IF errorlevel 1 EXIT 1 + GOTO CASE_end + +:CASE_basemap_data + "%PYTHON%" -m pip install packages\basemap_data --no-deps --ignore-installed -vvv + IF errorlevel 1 EXIT 1 + GOTO CASE_end + +:CASE_basemap_data_hires + "%PYTHON%" -m pip install packages\basemap_data_hires --no-deps --ignore-installed -vvv + IF errorlevel 1 EXIT 1 + GOTO CASE_end + + +:CASE_END diff --git a/recipe/bld.bat b/recipe/bld.bat deleted file mode 100644 index f2b99ea..0000000 --- a/recipe/bld.bat +++ /dev/null @@ -1,30 +0,0 @@ -:: Ensure our geos will be used. -set GEOS_DIR=%LIBRARY_PREFIX% -rmdir %SRC_DIR%\geos-3.3.3 /s /q || exit 1 -del src/_geoslib.c -cythonize --force src/_geoslib.pyx - -:: Installing via pip has some issues, use setuptools -:: "%PYTHON%" -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv -%PYTHON% setup.py install --single-version-externally-managed --record=record.txt -if errorlevel 1 exit 1 - -:: Remove the data from the site-packages directory. -rmdir %SP_DIR%\mpl_toolkits\basemap\data /s /q || exit 1 - -:: Create the data directory. -set DATADIR="%LIBRARY_PREFIX%\share\basemap" -mkdir %DATADIR% || exit 1 - -:: Copy all the data. -xcopy %SRC_DIR%\lib\mpl_toolkits\basemap\data\* %DATADIR% /s /e || exit 1 - -:: But remove the high resolution data. (Packaged separately.) -del %DATADIR%\*_i.dat -del %DATADIR%\*_h.dat -del %DATADIR%\*_f.dat -del %DATADIR%\UScounties.* -del %DATADIR%\test27 -del %DATADIR%\test83 -del %DATADIR%\testntv2 -del %DATADIR%\testvarious diff --git a/recipe/build-basemap.sh b/recipe/build-basemap.sh new file mode 100644 index 0000000..9c0cebd --- /dev/null +++ b/recipe/build-basemap.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +echo "====================================================================================================" +echo "Building $PKG_NAME" +echo "" + +export GEOS_DIR=$PREFIX + +case $PKG_NAME in + + basemap) + $PYTHON -m pip install packages/basemap --no-deps --ignore-installed -vvv + ;; + + basemap-data) + $PYTHON -m pip install packages/basemap_data --no-deps --ignore-installed -vvv + ;; + + basemap-data-hires) + $PYTHON -m pip install packages/basemap_data_hires --no-deps --ignore-installed -vvv + ;; + + *) + echo "No build instructions for $PKG_NAME" + exit 1 + ;; + +esac diff --git a/recipe/build.sh b/recipe/build.sh deleted file mode 100644 index 2b47866..0000000 --- a/recipe/build.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# Ensure our geos will be used. -rm -rf $SRC_DIR/geos-3.3.3 -rm src/_geoslib.c -cythonize --force src/_geoslib.pyx - -export GEOS_DIR=$PREFIX - -$PYTHON -m pip install . --no-deps --ignore-installed -vvv - -# Remove the data from the site-packages directory. -rm -rf $SP_DIR/mpl_toolkits/basemap/data - -# Create the data directory. -DATADIR="$PREFIX/share/basemap" - -# Copy all the data. -cp -a $SRC_DIR/lib/mpl_toolkits/basemap/data/ $DATADIR - -# But remove the high resolution data. (Packaged separately.) -rm -f $DATADIR/*_i.dat -rm -f $DATADIR/*_h.dat -rm -f $DATADIR/*_f.dat -rm -f $DATADIR/UScounties.* -rm -f $DATADIR/{test27,testvarious,test83,testntv2} diff --git a/recipe/data.patch b/recipe/data.patch deleted file mode 100644 index 194c09e..0000000 --- a/recipe/data.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- basemap-1.2.1rel.orig/lib/mpl_toolkits/basemap/__init__.py 2019-08-07 22:03:01.000000000 -0300 -+++ basemap-1.2.1rel/lib/mpl_toolkits/basemap/__init__.py 2019-08-08 11:15:02.145868394 -0300 -@@ -53,15 +53,10 @@ - import _geoslib - import functools - --# basemap data files now installed in lib/matplotlib/toolkits/basemap/data --# check to see if environment variable BASEMAPDATA set to a directory, --# and if so look for the data there. --if 'BASEMAPDATA' in os.environ: -- basemap_datadir = os.environ['BASEMAPDATA'] -- if not os.path.isdir(basemap_datadir): -- raise RuntimeError('Path in environment BASEMAPDATA not a directory') -+if os.name == 'nt': -+ basemap_datadir = os.path.join(sys.prefix, 'Library', 'share', 'basemap') - else: -- basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data']) -+ basemap_datadir = os.path.join(sys.prefix, 'share', 'basemap') - - __version__ = '1.2.1' - -@@ -154,7 +149,8 @@ - } - - # create dictionary that maps epsg codes to Basemap kwargs. --epsgf = open(os.path.join(basemap_datadir, 'epsg')) -+pyproj_datadir = os.environ['PROJ_LIB'] -+epsgf = open(os.path.join(basemap_datadir,'epsg')) - epsg_dict={} - for line in epsgf: - if line.startswith("#"): -@@ -1222,11 +1218,12 @@ - read boundary data, clip to map projection region. - """ - msg = dedent(""" -- Unable to open boundary dataset file. Only the 'crude', 'low', -- 'intermediate' and 'high' resolution datasets are installed by default. -- If you are requesting a 'full' resolution dataset, you may need to -- download and install those files separately -- (see the basemap README for details).""") -+ Unable to open boundary dataset file. Only the 'crude' and 'low', -+ resolution datasets are installed by default. -+ If you are requesting an, 'intermediate', 'high' or 'full' -+ resolution dataset, you may need to download and install those -+ files separately with -+ `conda install basemap-data-hires`.""") - # only gshhs coastlines can be polygons. - if name != 'gshhs': as_polygons=False - try: -@@ -1981,6 +1978,11 @@ - """ - ax = ax or self._check_ax() - gis_file = os.path.join(basemap_datadir,'UScounties') -+ if not os.path.isfile(gis_file + '.shp'): -+ msg = ('Cannot find {}.shp\nYou can install it with' -+ '`conda install basemap-data-hires`').format -+ raise IOError(msg(gis_file)) -+ ax = ax or self._check_ax() - county_info = self.readshapefile(gis_file,'counties',\ - default_encoding='latin-1',drawbounds=drawbounds) - counties = [coords for coords in self.counties] diff --git a/recipe/install_hires_instructions.patch b/recipe/install_hires_instructions.patch new file mode 100644 index 0000000..bccc824 --- /dev/null +++ b/recipe/install_hires_instructions.patch @@ -0,0 +1,13 @@ +diff -ru basemap-1.3.1.orig/packages/basemap/src/mpl_toolkits/basemap/__init__.py basemap-1.3.1/packages/basemap/src/mpl_toolkits/basemap/__init__.py +--- basemap-1.3.1.orig/packages/basemap/src/mpl_toolkits/basemap/__init__.py 2022-01-31 12:16:48.000000000 -0700 ++++ basemap-1.3.1/packages/basemap/src/mpl_toolkits/basemap/__init__.py 2022-02-08 11:22:55.000000000 -0700 +@@ -1226,7 +1226,8 @@ + Unable to open boundary dataset file. Only the 'crude', 'low' and + 'intermediate' resolution datasets are installed by default. If you + are requesting a 'high' or 'full' resolution dataset, you need to +- install the `basemap-data-hires` package.""") ++ install the `basemap-data-hires` package with ++ `conda install -c conda-forge basemap-data-hires`.""") + # only gshhs coastlines can be polygons. + if name != 'gshhs': as_polygons=False + try: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8cf4df8..e212fbe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,71 +1,130 @@ -{% set version = "1.2.2" %} +{% set version = "1.3.1" %} package: - name: basemap + name: basemap-split version: {{ version }} source: - url: https://github.com/matplotlib/basemap/archive/v{{ version }}rel.tar.gz - sha256: 7e6ee5d03b10168862cff82bfa819df8264c04f078eac4549a22dd2631696613 + url: https://github.com/matplotlib/basemap/archive/v{{ version }}.tar.gz + sha256: 8f4ed7d5736711ba2b413e5fe038d4349d35eb3f28cba836094b6cca5f0a634f patches: - - data.patch + # Update messages regarding installation of `basemap-data-hires`. + - install_hires_instructions.patch build: - number: 2 - # This package isn't included to the SOW Packages list - skip: True # [linux and s390x] - skip: True # [win and py2k] + number: 0 + #skip: True # [linux and s390x] + skip: True # [py<3.8] Dependencies require 3.8+ ignore_run_exports: - proj requirements: build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - m2-patch # [win] - patch # [not win] - host: - - python - - cython - - geos - - numpy - - pip - - proj - - pyproj - - setuptools - - wheel - run: - - python - - {{ pin_compatible('numpy') }} - - geos - - matplotlib-base >=1.0.0,!=3.0.1 - - proj - - pyproj >=1.9.3 - - pyshp >=1.2.0 - - six -test: - imports: - - mpl_toolkits.basemap - requires: - - pip - commands: - - pip check - - python -c "from mpl_toolkits.basemap import Basemap" -about: - home: http://matplotlib.org/basemap - license: MIT - license_family: MIT - license_file: README.md - summary: 'Plot on map projections using matplotlib' - description: | - Basemap toolkit is a library for plotting 2D data on maps in Python. - It is similar in functionality to the matlab mapping toolbox, the IDL mapping facilities, GrADS, or the Generic Mapping Tools. - dev_url: https://github.com/matplotlib/basemap - doc_url: http://matplotlib.org/basemap/ - doc_source_url: https://github.com/matplotlib/basemap/blob/master/doc/index.rst +outputs: + + - name: basemap + script: build-basemap.sh # [not win] + script: bld-basemap.bat # [win] + build: + requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + host: + - python + - pip + - cython >=0.29,<3.1 + - numpy >=1.19 + - geos + - pyproj + - proj + - setuptools + - wheel + run: + - {{ pin_subpackage('basemap-data') }} + - python + - {{ pin_compatible('numpy') }} + - {{ pin_compatible('geos') }} + - matplotlib-base >=1.0.0,!=3.0.1 + - pyproj >=1.9.3 + - pyshp >=1.2.0 + - proj + - six >=1.10,<1.16 + test: + imports: + - mpl_toolkits.basemap + requires: + - pip + - {{ pin_subpackage('basemap-data') }} + commands: + - pip check + - python -c "from mpl_toolkits.basemap import Basemap" + about: + home: http://matplotlib.org/basemap + license: MIT + license_family: MIT + license_file: + - packages/basemap/LICENSE + summary: 'Plot on map projections using matplotlib' + description: | + Basemap toolkit is a library for plotting 2D data on maps in Python. + It is similar in functionality to the matlab mapping toolbox, the IDL mapping facilities, GrADS, or the Generic Mapping Tools. + dev_url: https://github.com/matplotlib/basemap + doc_url: http://matplotlib.org/basemap/ + doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst + + - name: basemap-data + script: build-basemap.sh # [not win] + script: bld-basemap.bat # [win] + build: + noarch: python + requirements: + host: + - python >=3.6 + - pip + - setuptools + - wheel + run: + - python >=3.6 + about: + home: http://matplotlib.org/basemap + license: LGPL-3.0-or-later + license_file: packages/basemap_data_hires/COPYING.LESSER + summary: Plot on map projections (with coastlines and political boundaries) using matplotlib. + dev_url: https://github.com/matplotlib/basemap + doc_url: http://matplotlib.org/basemap/ + doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst + + - name: basemap-data-hires + script: build-basemap.sh # [not win] + script: bld-basemap.bat # [win] + build: + noarch: python + requirements: + host: + - python >=3.6 + - pip + - setuptools + - wheel + run: + - {{ pin_subpackage('basemap-data') }} + - python >=3.6 + about: + home: http://matplotlib.org/basemap + license: LGPL-3.0-or-later + license_file: packages/basemap_data_hires/COPYING.LESSER + summary: Plot on map projections (with coastlines and political boundaries) using matplotlib. + dev_url: https://github.com/matplotlib/basemap + doc_url: http://matplotlib.org/basemap/ + doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst + + extra: recipe-maintainers: + - molinav - ocefpaf diff --git a/recipe/use_proj_data.patch b/recipe/use_proj_data.patch deleted file mode 100644 index f919292..0000000 --- a/recipe/use_proj_data.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- basemap-1.1.0.orig/lib/mpl_toolkits/basemap/__init__.py 2017-05-04 17:53:42.000000000 -0300 -+++ basemap-1.1.0/lib/mpl_toolkits/basemap/__init__.py 2018-08-31 13:09:10.768728089 -0300 -@@ -154,7 +154,8 @@ - } - - # create dictionary that maps epsg codes to Basemap kwargs. --epsgf = open(os.path.join(basemap_datadir,'epsg')) -+pyproj_datadir = os.environ['PROJ_LIB'] -+epsgf = open(os.path.join(pyproj_datadir,'epsg')) - epsg_dict={} - for line in epsgf: - if line.startswith("#"): From a83aba5840b1b56159f1018a87c6c6284d40ed96 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 14:55:53 -0700 Subject: [PATCH 39/56] remove proj from dependencies --- recipe/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e212fbe..855d5be 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,8 +15,6 @@ build: number: 0 #skip: True # [linux and s390x] skip: True # [py<3.8] Dependencies require 3.8+ - ignore_run_exports: - - proj requirements: build: @@ -41,7 +39,6 @@ outputs: - numpy >=1.19 - geos - pyproj - - proj - setuptools - wheel run: @@ -52,7 +49,6 @@ outputs: - matplotlib-base >=1.0.0,!=3.0.1 - pyproj >=1.9.3 - pyshp >=1.2.0 - - proj - six >=1.10,<1.16 test: imports: From 6ba1f4b7afee0b42bef268aa653f78c272a0c1ab Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 15:11:14 -0700 Subject: [PATCH 40/56] typo correction --- recipe/bld-basemap.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/bld-basemap.bat b/recipe/bld-basemap.bat index bc75de0..ef5d393 100644 --- a/recipe/bld-basemap.bat +++ b/recipe/bld-basemap.bat @@ -6,9 +6,9 @@ ECHO "" set GEOS_DIR=%LIBRARY_PREFIX% :: Jump to the correct build section -if "%PKG_NAME"=="basemap" GOTO CASE_basemap -if "%PKG_NAME"=="basemap-data" GOTO CASE_basemap_data -if "%PKG_NAME"=="basemap-data-hires" GOTO CASE_basemap_data_hires +if "%PKG_NAME%"=="basemap" GOTO CASE_basemap +if "%PKG_NAME%"=="basemap-data" GOTO CASE_basemap_data +if "%PKG_NAME%"=="basemap-data-hires" GOTO CASE_basemap_data_hires ECHO "Unknown package: %PKG_NAME%" EXIT 1 From 16916374ecd4aac2d62085d21daf9f9bb8ac3dd7 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 16:00:29 -0700 Subject: [PATCH 41/56] skip win32, missing depends --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 855d5be..9a38146 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: build: number: 0 - #skip: True # [linux and s390x] + skip: True # [win32] Missing dependencies in win32 arch and not expecting they will be updated. skip: True # [py<3.8] Dependencies require 3.8+ requirements: From 16391b0921ed4a6b598b737f2283063b4a52036f Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 16:05:44 -0700 Subject: [PATCH 42/56] cleanup --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9a38146..41fcc76 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,5 @@ {% set version = "1.3.1" %} +{% set build_number = "0" %} package: name: basemap-split @@ -12,7 +13,8 @@ source: - install_hires_instructions.patch build: - number: 0 + number: {{ build_number }} + skip: True # [s390x] Missing dependencies. skip: True # [win32] Missing dependencies in win32 arch and not expecting they will be updated. skip: True # [py<3.8] Dependencies require 3.8+ From d58f5295cb0662a90ab5137c2569ce24cae74d0d Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 16:31:35 -0700 Subject: [PATCH 43/56] pin update --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 41fcc76..215d7cc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,7 +48,7 @@ outputs: - python - {{ pin_compatible('numpy') }} - {{ pin_compatible('geos') }} - - matplotlib-base >=1.0.0,!=3.0.1 + - matplotlib-base >=1.5,!=3.0.1 - pyproj >=1.9.3 - pyshp >=1.2.0 - six >=1.10,<1.16 From b932e8ce4d232a9eb2e8d241b1e463f535daa7b1 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 16:53:04 -0700 Subject: [PATCH 44/56] pin update --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 215d7cc..c38c10a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ outputs: - python - pip - cython >=0.29,<3.1 - - numpy >=1.19 + - numpy >=1.21 - geos - pyproj - setuptools From 886f50ab81787dbb996096473b5ebfed5b68bfdb Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 17:05:44 -0700 Subject: [PATCH 45/56] pin update --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c38c10a..be9d147 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,8 @@ outputs: - python - pip - cython >=0.29,<3.1 - - numpy >=1.21 + - numpy >=1.21 # [py>=3.10 or not linux-aarch64] + - numpy >=1.19 # [py<3.10 and linux-aarch64] - geos - pyproj - setuptools From bc54754746030c44bcbc3ef719a10f45598de457 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 17:12:13 -0700 Subject: [PATCH 46/56] pin update --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index be9d147..542f6a4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,8 +38,8 @@ outputs: - python - pip - cython >=0.29,<3.1 - - numpy >=1.21 # [py>=3.10 or not linux-aarch64] - - numpy >=1.19 # [py<3.10 and linux-aarch64] + - numpy >=1.21 # [py>=3.10 or not linux-ppc64le] + - numpy >=1.19 # [py<3.10 and linux-ppc64le] - geos - pyproj - setuptools From b2441d0a3bf869ec144aa3bb549f566b3c5d8ea3 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 17:30:56 -0700 Subject: [PATCH 47/56] pin update --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 542f6a4..0564782 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,7 +38,7 @@ outputs: - python - pip - cython >=0.29,<3.1 - - numpy >=1.21 # [py>=3.10 or not linux-ppc64le] + - numpy >=1.21 # [(py>=3.10 and linux-ppc64le) or not linux-ppc64le] - numpy >=1.19 # [py<3.10 and linux-ppc64le] - geos - pyproj From 87eb35e790e977064ec67e5941e20927d7d63db0 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 10 Feb 2022 17:41:53 -0700 Subject: [PATCH 48/56] pin update --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0564782..ac1e940 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,8 +38,8 @@ outputs: - python - pip - cython >=0.29,<3.1 - - numpy >=1.21 # [(py>=3.10 and linux-ppc64le) or not linux-ppc64le] - - numpy >=1.19 # [py<3.10 and linux-ppc64le] + - numpy >=1.21 # [not linux-ppc64le] + - numpy >=1.19 # [linux-ppc64le] - geos - pyproj - setuptools From bbb354222f23b6055891353b927b53fcd8fca6f6 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Mon, 14 Feb 2022 17:17:49 -0700 Subject: [PATCH 49/56] correct selector for ppc64le --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ac1e940..f0fc018 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,8 +38,8 @@ outputs: - python - pip - cython >=0.29,<3.1 - - numpy >=1.21 # [not linux-ppc64le] - - numpy >=1.19 # [linux-ppc64le] + - numpy >=1.21 # [not ppc64le] + - numpy >=1.19 # [ppc64le] - geos - pyproj - setuptools From b90f0681938ac055ca2931f328965f62dd3ed90c Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Wed, 16 Feb 2022 09:59:16 -0700 Subject: [PATCH 50/56] Post-review changes. --- recipe/meta.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f0fc018..b1a3e56 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -16,7 +16,7 @@ build: number: {{ build_number }} skip: True # [s390x] Missing dependencies. skip: True # [win32] Missing dependencies in win32 arch and not expecting they will be updated. - skip: True # [py<3.8] Dependencies require 3.8+ + skip: True # [py<38] Dependencies require 3.8+ requirements: build: @@ -83,7 +83,7 @@ outputs: noarch: python requirements: host: - - python >=3.6 + - python - pip - setuptools - wheel @@ -92,6 +92,7 @@ outputs: about: home: http://matplotlib.org/basemap license: LGPL-3.0-or-later + license_family: LGPL license_file: packages/basemap_data_hires/COPYING.LESSER summary: Plot on map projections (with coastlines and political boundaries) using matplotlib. dev_url: https://github.com/matplotlib/basemap @@ -105,7 +106,7 @@ outputs: noarch: python requirements: host: - - python >=3.6 + - python - pip - setuptools - wheel @@ -115,6 +116,7 @@ outputs: about: home: http://matplotlib.org/basemap license: LGPL-3.0-or-later + license_family: LGPL license_file: packages/basemap_data_hires/COPYING.LESSER summary: Plot on map projections (with coastlines and political boundaries) using matplotlib. dev_url: https://github.com/matplotlib/basemap From 31b7ea7d0df5cc355f606abbff17f734a7f5baf5 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Wed, 16 Feb 2022 10:30:02 -0700 Subject: [PATCH 51/56] correct pinning for pyproj and pyshp --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b1a3e56..631ef0e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -50,8 +50,8 @@ outputs: - {{ pin_compatible('numpy') }} - {{ pin_compatible('geos') }} - matplotlib-base >=1.5,!=3.0.1 - - pyproj >=1.9.3 - - pyshp >=1.2.0 + - pyproj >=1.9.3,<3.4 + - pyshp >=1.2.0,<2.2 - six >=1.10,<1.16 test: imports: From 7c4105941950c074112bffd87075cbe6b9b4ff23 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Wed, 16 Feb 2022 18:59:03 -0700 Subject: [PATCH 52/56] http --> https --- recipe/meta.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 631ef0e..7abd6d3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -63,7 +63,7 @@ outputs: - pip check - python -c "from mpl_toolkits.basemap import Basemap" about: - home: http://matplotlib.org/basemap + home: https://matplotlib.org/basemap license: MIT license_family: MIT license_file: @@ -73,7 +73,7 @@ outputs: Basemap toolkit is a library for plotting 2D data on maps in Python. It is similar in functionality to the matlab mapping toolbox, the IDL mapping facilities, GrADS, or the Generic Mapping Tools. dev_url: https://github.com/matplotlib/basemap - doc_url: http://matplotlib.org/basemap/ + doc_url: https://matplotlib.org/basemap/ doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst - name: basemap-data @@ -90,13 +90,13 @@ outputs: run: - python >=3.6 about: - home: http://matplotlib.org/basemap + home: https://matplotlib.org/basemap license: LGPL-3.0-or-later license_family: LGPL license_file: packages/basemap_data_hires/COPYING.LESSER summary: Plot on map projections (with coastlines and political boundaries) using matplotlib. dev_url: https://github.com/matplotlib/basemap - doc_url: http://matplotlib.org/basemap/ + doc_url: https://matplotlib.org/basemap/ doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst - name: basemap-data-hires @@ -114,13 +114,13 @@ outputs: - {{ pin_subpackage('basemap-data') }} - python >=3.6 about: - home: http://matplotlib.org/basemap + home: https://matplotlib.org/basemap license: LGPL-3.0-or-later license_family: LGPL license_file: packages/basemap_data_hires/COPYING.LESSER summary: Plot on map projections (with coastlines and political boundaries) using matplotlib. dev_url: https://github.com/matplotlib/basemap - doc_url: http://matplotlib.org/basemap/ + doc_url: https://matplotlib.org/basemap/ doc_source_url: https://github.com/matplotlib/basemap/blob/v{{ version }}/packages/basemap/doc/index.rst From c4481342d11ef0b8703577b51af4a841be5fc3fe Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 17 Feb 2022 11:12:06 -0700 Subject: [PATCH 53/56] - Update from `1.3.1` to `1.3.2`. - Add patch to workaround Basemap changes in dependencies. NOTE: `linux-s390x` architecture fails due to missing dependencies. https://github.com/matplotlib/basemap/blob/v1.3.2/CHANGELOG.md 2 important items: - CVE fixes (note that we are working around this issue) - Removal of deprecation notices https://github.com/matplotlib/basemap/issues There are plenty of issues, but I dont' see any obvious regressions that affect us. https://github.com/pyproj4/pyproj/blob/48d922ad57316eab45d15ccfe41595c1e5e97039/setup.cfg#L38 pyproj dependency requires `py>=3.8` https://github.com/matplotlib/basemap/blob/v1.3.2/packages/basemap/requirements.txt numpy, matplotlib, pyproj, pyshp Basic testing works. --- recipe/build-basemap.sh | 1 + recipe/meta.yaml | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/recipe/build-basemap.sh b/recipe/build-basemap.sh index 9c0cebd..4e07120 100644 --- a/recipe/build-basemap.sh +++ b/recipe/build-basemap.sh @@ -9,6 +9,7 @@ export GEOS_DIR=$PREFIX case $PKG_NAME in basemap) + rm -f packages/basemap/pyproject.toml $PYTHON -m pip install packages/basemap --no-deps --ignore-installed -vvv ;; diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7abd6d3..dc91a18 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.3.1" %} +{% set version = "1.3.2" %} {% set build_number = "0" %} package: @@ -7,10 +7,11 @@ package: source: url: https://github.com/matplotlib/basemap/archive/v{{ version }}.tar.gz - sha256: 8f4ed7d5736711ba2b413e5fe038d4349d35eb3f28cba836094b6cca5f0a634f + sha256: c35aa397be4de342a3078ec089094531609712abd78e3d11b92d792974fd8141 patches: # Update messages regarding installation of `basemap-data-hires`. - install_hires_instructions.patch + - install_numpy_override.patch # <--- This is a horible hack. Remove ASAP. build: number: {{ build_number }} @@ -27,7 +28,7 @@ requirements: outputs: - name: basemap - script: build-basemap.sh # [not win] + script: build-basemap.sh # [not win] This script will delete `pyproject.toml`. Remove ASAP. script: bld-basemap.bat # [win] build: requirements: From e3cf15b41e095018d9bb36efbec39bff0b207988 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 17 Feb 2022 12:13:54 -0700 Subject: [PATCH 54/56] patch --- recipe/install_numpy_override.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 recipe/install_numpy_override.patch diff --git a/recipe/install_numpy_override.patch b/recipe/install_numpy_override.patch new file mode 100644 index 0000000..6e43f94 --- /dev/null +++ b/recipe/install_numpy_override.patch @@ -0,0 +1,11 @@ +--- basemap-1.3.2-orig/packages/basemap/requirements.txt 2022-02-10 07:33:34.000000000 -0700 ++++ basemap-1.3.2/packages/basemap/requirements.txt 2022-02-16 15:57:10.000000000 -0700 +@@ -9,7 +9,7 @@ + numpy >= 1.15, < 1.17; python_version == "3.4" + numpy >= 1.16, < 1.19; python_version == "3.5" + numpy >= 1.16, < 1.20; python_version == "3.6" +-numpy >= 1.21, < 1.23; python_version >= "3.7" ++numpy >= 1.19, < 1.23; python_version >= "3.7" + + cycler < 0.11; python_version == "3.2" + pyparsing >= 1.5, < 2.4.1; python_version == "2.6" From 26470da6aae5d8c9faada6835c6dfd5d1e413c56 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Thu, 17 Feb 2022 14:44:30 -0700 Subject: [PATCH 55/56] increment build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dc91a18..778080a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "1.3.2" %} -{% set build_number = "0" %} +{% set build_number = "1" %} package: name: basemap-split From e2ae9b6501acd6d1c2c8b3caf575a9446e931ce7 Mon Sep 17 00:00:00 2001 From: Scott Bailey Date: Fri, 18 Feb 2022 13:20:16 -0700 Subject: [PATCH 56/56] testing another config --- recipe/meta.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 778080a..af5d9dc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,9 +15,6 @@ source: build: number: {{ build_number }} - skip: True # [s390x] Missing dependencies. - skip: True # [win32] Missing dependencies in win32 arch and not expecting they will be updated. - skip: True # [py<38] Dependencies require 3.8+ requirements: build: @@ -31,6 +28,9 @@ outputs: script: build-basemap.sh # [not win] This script will delete `pyproject.toml`. Remove ASAP. script: bld-basemap.bat # [win] build: + skip: True # [s390x] Missing dependencies. + skip: True # [win32] Missing dependencies in win32 arch and not expecting they will be updated. + skip: True # [py<38] Dependencies require 3.8+ requirements: build: - {{ compiler('c') }} @@ -82,6 +82,9 @@ outputs: script: bld-basemap.bat # [win] build: noarch: python + skip: True # [s390x] Missing dependencies. + skip: True # [win32] Missing dependencies in win32 arch and not expecting they will be updated. + skip: True # [py<38] Dependencies require 3.8+ requirements: host: - python @@ -105,6 +108,9 @@ outputs: script: bld-basemap.bat # [win] build: noarch: python + skip: True # [s390x] Missing dependencies. + skip: True # [win32] Missing dependencies in win32 arch and not expecting they will be updated. + skip: True # [py<38] Dependencies require 3.8+ requirements: host: - python