diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 654a675..0000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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:
-
- BINSTAR_TOKEN:
- # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
- secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1
-
- matrix:
- - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6
- CONDA_INSTALL_LOCN: C:\Miniconda36-x64
-
- - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7
- CONDA_INSTALL_LOCN: C:\Miniconda36-x64
-
-
-# We always use a 64-bit machine, but can build x86 distributions
-# with the TARGET_ARCH variable.
-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')"
- "%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.)
- - cmd: rmdir C:\cygwin /s /q
-
- # Add path, activate `conda` and update conda.
- - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
- - cmd: conda.exe update --yes --quiet conda
-
- - cmd: set PYTHONUNBUFFERED=1
-
- # Configure the VM.
- # 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
-deploy_script:
- - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml
\ No newline at end of file
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
index 6f4c5f4..ee2a57a 100755
--- a/.azure-pipelines/azure-pipelines-win.yml
+++ b/.azure-pipelines/azure-pipelines-win.yml
@@ -13,11 +13,11 @@ jobs:
win_c_compilervs2015cxx_compilervs2015python3.6:
CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6
CONDA_BLD_PATH: D:\\bld\\
- UPLOAD_PACKAGES: False
+ UPLOAD_PACKAGES: True
win_c_compilervs2015cxx_compilervs2015python3.7:
CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7
CONDA_BLD_PATH: D:\\bld\\
- UPLOAD_PACKAGES: False
+ UPLOAD_PACKAGES: True
steps:
# TODO: Fast finish on azure pipelines?
- script: |
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/README.md b/README.md
index 2ac07f0..3536976 100644
--- a/README.md
+++ b/README.md
@@ -15,14 +15,7 @@ Current build status
====================
-
- Appveyor |
-
-
-
-
- |
-
+
Azure |
diff --git a/build-locally.py b/build-locally.py
index a7d9c2d..51d6a6e 100755
--- a/build-locally.py
+++ b/build-locally.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# This file has been generated by conda-smithy in order to build the recipe
# locally.
@@ -55,4 +55,4 @@ def main(args=None):
if __name__ == "__main__":
- main()
\ No newline at end of file
+ main()
diff --git a/conda-forge.yml b/conda-forge.yml
index cd82191..a4b443d 100644
--- a/conda-forge.yml
+++ b/conda-forge.yml
@@ -5,3 +5,8 @@ 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=}
+provider:
+ osx: azure
+ linux: azure
+ win: azure
+
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
- - pyproj >=1.9.3,<2
+ - matplotlib-base >=1.0.0,!=3.0.1
+ - pyproj >=1.9.3
+ - proj4 >=4.9.3,<6
- 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 >=1.9.3
- pyshp >=1.2.0
+ - proj4 >=4.9.3,<6
- six
test:
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):
diff --git a/recipe/use_proj_data.patch b/recipe/use_proj_data.patch
deleted file mode 100644
index 13e8a18..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
-@@ -140,7 +140,8 @@
- }
-
- # create dictionary that maps epsg codes to Basemap kwargs.
--epsgf = open(os.path.join(pyproj.pyproj_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("#"):