diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
index 3adf3ac..8d62612 100755
--- a/.azure-pipelines/azure-pipelines-linux.yml
+++ b/.azure-pipelines/azure-pipelines-linux.yml
@@ -8,16 +8,8 @@ jobs:
vmImage: ubuntu-latest
strategy:
matrix:
- linux_64_python3.7.____cpython:
- CONFIG: linux_64_python3.7.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7
- linux_64_python3.8.____cpython:
- CONFIG: linux_64_python3.8.____cpython
- UPLOAD_PACKAGES: 'True'
- DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7
- linux_64_python3.9.____cpython:
- CONFIG: linux_64_python3.9.____cpython
+ linux_64_:
+ CONFIG: linux_64_
UPLOAD_PACKAGES: 'True'
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7
timeoutInMinutes: 360
@@ -40,6 +32,11 @@ jobs:
export CI=azure
export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME
export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME})
+ if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then
+ export IS_PR_BUILD="True"
+ else
+ export IS_PR_BUILD="False"
+ fi
.scripts/run_docker_build.sh
displayName: Run docker build
env:
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
deleted file mode 100755
index 46f2d97..0000000
--- a/.azure-pipelines/azure-pipelines-osx.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
- pool:
- vmImage: macOS-10.15
- strategy:
- matrix:
- osx_64_python3.7.____cpython:
- CONFIG: osx_64_python3.7.____cpython
- UPLOAD_PACKAGES: 'True'
- osx_64_python3.8.____cpython:
- CONFIG: osx_64_python3.8.____cpython
- UPLOAD_PACKAGES: 'True'
- osx_64_python3.9.____cpython:
- CONFIG: osx_64_python3.9.____cpython
- UPLOAD_PACKAGES: 'True'
- timeoutInMinutes: 360
-
- steps:
- # TODO: Fast finish on azure pipelines?
- - script: |
- export CI=azure
- export OSX_FORCE_SDK_DOWNLOAD="1"
- export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME
- export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME})
- ./.scripts/run_osx_build.sh
- displayName: Run OSX build
- env:
- BINSTAR_TOKEN: $(BINSTAR_TOKEN)
- FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN)
- STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN)
\ No newline at end of file
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
deleted file mode 100755
index b2bc4f7..0000000
--- a/.azure-pipelines/azure-pipelines-win.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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
- pool:
- vmImage: vs2017-win2016
- strategy:
- matrix:
- win_64_python3.7.____cpython:
- CONFIG: win_64_python3.7.____cpython
- UPLOAD_PACKAGES: 'True'
- win_64_python3.8.____cpython:
- CONFIG: win_64_python3.8.____cpython
- UPLOAD_PACKAGES: 'True'
- win_64_python3.9.____cpython:
- CONFIG: win_64_python3.9.____cpython
- UPLOAD_PACKAGES: 'True'
- timeoutInMinutes: 360
- variables:
- CONDA_BLD_PATH: D:\\bld\\
-
- steps:
- - 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-ci-setup=3" pip' # Optional
- installOptions: "-c conda-forge"
- updateConda: true
- displayName: Install conda-build and activate environment
-
- - script: set PYTHONUNBUFFERED=1
- displayName: Set PYTHONUNBUFFERED
-
- # Configure the VM
- - script: |
- call activate base
- setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml
- displayName: conda-forge CI setup
-
- # Configure the VM.
- - script: |
- set "CI=azure"
- call activate base
- run_conda_forge_build_setup
- displayName: conda-forge build setup
-
-
- # Special cased version setting some more things!
- - script: |
- call activate base
- 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"
- PYTHONUNBUFFERED: 1
- condition: contains(variables['CONFIG'], 'vs2008')
-
- - script: |
- call activate base
- conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables
- displayName: Build recipe
- env:
- PYTHONUNBUFFERED: 1
- condition: not(contains(variables['CONFIG'], 'vs2008'))
- - script: |
- set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%"
- call activate base
- validate_recipe_outputs "%FEEDSTOCK_NAME%"
- displayName: Validate Recipe Outputs
-
- - script: |
- set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%"
- set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%"
- call activate base
- upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml
- displayName: Upload package
- env:
- BINSTAR_TOKEN: $(BINSTAR_TOKEN)
- FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN)
- STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN)
- condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')))
\ No newline at end of file
diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_.yaml
similarity index 53%
rename from .ci_support/linux_64_python3.9.____cpython.yaml
rename to .ci_support/linux_64_.yaml
index 5373535..cf18929 100644
--- a/.ci_support/linux_64_python3.9.____cpython.yaml
+++ b/.ci_support/linux_64_.yaml
@@ -1,19 +1,11 @@
cdt_name:
- cos6
channel_sources:
-- conda-forge,defaults
+- conda-forge
channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-comp7
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.9.* *_cpython
-target_platform:
-- linux-64
zip_keys:
- - cdt_name
- docker_image
diff --git a/.ci_support/linux_64_python3.7.____cpython.yaml b/.ci_support/linux_64_python3.7.____cpython.yaml
deleted file mode 100644
index ae99d55..0000000
--- a/.ci_support/linux_64_python3.7.____cpython.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-cdt_name:
-- cos6
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-docker_image:
-- quay.io/condaforge/linux-anvil-comp7
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.7.* *_cpython
-target_platform:
-- linux-64
-zip_keys:
-- - cdt_name
- - docker_image
diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml
deleted file mode 100644
index f0c7b1c..0000000
--- a/.ci_support/linux_64_python3.8.____cpython.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-cdt_name:
-- cos6
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-docker_image:
-- quay.io/condaforge/linux-anvil-comp7
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.8.* *_cpython
-target_platform:
-- linux-64
-zip_keys:
-- - cdt_name
- - docker_image
diff --git a/.ci_support/osx_64_python3.7.____cpython.yaml b/.ci_support/osx_64_python3.7.____cpython.yaml
deleted file mode 100644
index 163d3ce..0000000
--- a/.ci_support/osx_64_python3.7.____cpython.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-macos_machine:
-- x86_64-apple-darwin13.4.0
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.7.* *_cpython
-target_platform:
-- osx-64
diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml
deleted file mode 100644
index 63cee21..0000000
--- a/.ci_support/osx_64_python3.8.____cpython.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-macos_machine:
-- x86_64-apple-darwin13.4.0
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.8.* *_cpython
-target_platform:
-- osx-64
diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml
deleted file mode 100644
index 51915a8..0000000
--- a/.ci_support/osx_64_python3.9.____cpython.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-macos_machine:
-- x86_64-apple-darwin13.4.0
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.9.* *_cpython
-target_platform:
-- osx-64
diff --git a/.ci_support/win_64_python3.7.____cpython.yaml b/.ci_support/win_64_python3.7.____cpython.yaml
deleted file mode 100644
index 281bd46..0000000
--- a/.ci_support/win_64_python3.7.____cpython.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.7.* *_cpython
-target_platform:
-- win-64
diff --git a/.ci_support/win_64_python3.8.____cpython.yaml b/.ci_support/win_64_python3.8.____cpython.yaml
deleted file mode 100644
index 0840c1a..0000000
--- a/.ci_support/win_64_python3.8.____cpython.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.8.* *_cpython
-target_platform:
-- win-64
diff --git a/.ci_support/win_64_python3.9.____cpython.yaml b/.ci_support/win_64_python3.9.____cpython.yaml
deleted file mode 100644
index f427bd2..0000000
--- a/.ci_support/win_64_python3.9.____cpython.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-channel_sources:
-- conda-forge,defaults
-channel_targets:
-- conda-forge main
-pin_run_as_build:
- python:
- min_pin: x.x
- max_pin: x.x
-python:
-- 3.9.* *_cpython
-target_platform:
-- win-64
diff --git a/.gitattributes b/.gitattributes
index 9060b27..ce52713 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,6 +18,7 @@ bld.bat text eol=crlf
.gitignore linguist-generated=true
.travis.yml linguist-generated=true
.scripts/* linguist-generated=true
+.woodpecker.yml linguist-generated=true
LICENSE.txt linguist-generated=true
README.md linguist-generated=true
azure-pipelines.yml linguist-generated=true
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3b8699d..7150753 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @DPeterK @bjlittle @corinnebosley @lbdreyer @ocefpaf @pelson @pp-mo @rhattersley
\ No newline at end of file
+* @DPeterK @bjlittle @corinnebosley @jamesp @lbdreyer @ocefpaf @pelson @pp-mo @rhattersley
\ No newline at end of file
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index 71a0686..a85ae38 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -25,7 +25,8 @@ conda-build:
root-dir: ${FEEDSTOCK_ROOT}/build_artifacts
CONDARC
-BUILD_CMD=build
+GET_BOA=boa
+BUILD_CMD=mambabuild
conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge
@@ -38,6 +39,7 @@ source run_conda_forge_build_setup
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
+
( endgroup "Configuring conda" ) 2> /dev/null
if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
@@ -62,7 +64,7 @@ else
( startgroup "Uploading packages" ) 2> /dev/null
- if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then
+ if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then
upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
fi
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
index 244ccd1..0c6515f 100755
--- a/.scripts/run_docker_build.sh
+++ b/.scripts/run_docker_build.sh
@@ -75,12 +75,15 @@ fi
( startgroup "Start Docker" ) 2> /dev/null
export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}"
+export IS_PR_BUILD="${IS_PR_BUILD:-False}"
+docker pull "${DOCKER_IMAGE}"
docker run ${DOCKER_RUN_ARGS} \
-v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \
-e CONFIG \
-e HOST_USER_ID \
-e UPLOAD_PACKAGES \
+ -e IS_PR_BUILD \
-e GIT_BRANCH \
-e UPLOAD_ON_BRANCH \
-e CI \
@@ -91,9 +94,9 @@ docker run ${DOCKER_RUN_ARGS} \
-e BINSTAR_TOKEN \
-e FEEDSTOCK_TOKEN \
-e STAGING_BINSTAR_TOKEN \
- $DOCKER_IMAGE \
+ "${DOCKER_IMAGE}" \
bash \
- /home/conda/feedstock_root/${PROVIDER_DIR}/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"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
deleted file mode 100755
index 96d0278..0000000
--- a/.scripts/run_osx_build.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-
-source .scripts/logging_utils.sh
-
-set -xe
-
-MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3}
-
-( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
-
-MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download"
-MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh"
-curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}"
-bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME}
-
-( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null
-
-( startgroup "Configuring conda" ) 2> /dev/null
-
-BUILD_CMD=build
-
-source ${MINIFORGE_HOME}/etc/profile.d/conda.sh
-conda activate base
-
-echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build."
-conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-}
-
-
-
-echo -e "\n\nSetting up the condarc and mangling the compiler."
-setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml
-
-if [[ "${CI:-}" != "" ]]; then
- mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml
-fi
-
-if [[ "${CI:-}" != "" ]]; then
- echo -e "\n\nMangling homebrew in the CI to avoid conflicts."
- /usr/bin/sudo mangle_homebrew
- /usr/bin/sudo -k
-else
- echo -e "\n\nNot mangling homebrew as we are not running in CI"
-fi
-
-echo -e "\n\nRunning the build setup script."
-source run_conda_forge_build_setup
-
-
-
-( endgroup "Configuring conda" ) 2> /dev/null
-
-
-echo -e "\n\nMaking the build clobber file"
-make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml
-
-conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-}
-( startgroup "Validating outputs" ) 2> /dev/null
-
-validate_recipe_outputs "${FEEDSTOCK_NAME}"
-
-( endgroup "Validating outputs" ) 2> /dev/null
-
-( startgroup "Uploading packages" ) 2> /dev/null
-
-if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then
- upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml
-fi
-
-( endgroup "Uploading packages" ) 2> /dev/null
\ No newline at end of file
diff --git a/README.md b/README.md
index dc1ab4f..ea82987 100644
--- a/README.md
+++ b/README.md
@@ -13,86 +13,11 @@ Current build status
====================
-
-
-
- | Azure |
+| All platforms: |
-
-
-
-
-
-
-
- | Variant | Status |
-
- | linux_64_python3.7.____cpython |
-
-
-
-
- |
-
- | linux_64_python3.8.____cpython |
-
-
-
-
- |
-
- | linux_64_python3.9.____cpython |
-
-
-
-
- |
-
- | osx_64_python3.7.____cpython |
-
-
-
-
- |
-
- | osx_64_python3.8.____cpython |
-
-
-
-
- |
-
- | osx_64_python3.9.____cpython |
-
-
-
-
- |
-
- | win_64_python3.7.____cpython |
-
-
-
-
- |
-
- | win_64_python3.8.____cpython |
-
-
-
-
- |
-
- | win_64_python3.9.____cpython |
-
-
-
-
- |
-
-
-
-
+
+
+
|
@@ -131,7 +56,8 @@ conda search iris --channel conda-forge
About conda-forge
=================
-[](http://numfocus.org)
+[](https://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
@@ -194,6 +120,7 @@ Feedstock Maintainers
* [@DPeterK](https://github.com/DPeterK/)
* [@bjlittle](https://github.com/bjlittle/)
* [@corinnebosley](https://github.com/corinnebosley/)
+* [@jamesp](https://github.com/jamesp/)
* [@lbdreyer](https://github.com/lbdreyer/)
* [@ocefpaf](https://github.com/ocefpaf/)
* [@pelson](https://github.com/pelson/)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6b346f5..ad85a2c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,6 +3,4 @@
# -*- mode: yaml -*-
jobs:
- - template: ./.azure-pipelines/azure-pipelines-linux.yml
- - template: ./.azure-pipelines/azure-pipelines-win.yml
- - template: ./.azure-pipelines/azure-pipelines-osx.yml
\ No newline at end of file
+ - template: ./.azure-pipelines/azure-pipelines-linux.yml
\ No newline at end of file
diff --git a/build-locally.py b/build-locally.py
index 00eeb34..8b74348 100755
--- a/build-locally.py
+++ b/build-locally.py
@@ -13,6 +13,7 @@
def setup_environment(ns):
os.environ["CONFIG"] = ns.config
os.environ["UPLOAD_PACKAGES"] = "False"
+ os.environ["IS_PR_BUILD"] = "True"
if ns.debug:
os.environ["BUILD_WITH_CONDA_DEBUG"] = "1"
if ns.output_id:
@@ -21,6 +22,10 @@ def setup_environment(ns):
os.environ["MINIFORGE_HOME"] = os.path.join(
os.path.dirname(__file__), "miniforge3"
)
+ if "OSX_SDK_DIR" not in os.environ:
+ os.environ["OSX_SDK_DIR"] = os.path.join(
+ os.path.dirname(__file__), "SDKs"
+ )
def run_docker_build(ns):
diff --git a/recipe/backport-4418.patch b/recipe/backport-4418.patch
new file mode 100644
index 0000000..2d662fb
--- /dev/null
+++ b/recipe/backport-4418.patch
@@ -0,0 +1,57 @@
+--- iris-3.1.0.orig/setup.cfg 2021-09-17 04:41:30.000000000 -0300
++++ iris-3.1.0/setup.cfg 2021-11-23 14:29:09.548120694 -0300
+@@ -2,7 +2,7 @@
+ author = SciTools Developers
+ author_email = scitools-iris-dev@googlegroups.com
+ classifiers =
+- Development Status :: 5 - Production/Stable
++ Development Status :: 5 Production/Stable
+ Intended Audience :: Science/Research
+ License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+ Operating System :: MacOS
+@@ -17,8 +17,7 @@
+ Topic :: Scientific/Engineering
+ Topic :: Scientific/Engineering :: Atmospheric Science
+ Topic :: Scientific/Engineering :: Visualization
+-description =
+- A powerful, format-agnostic, community-driven Python package for analysing and visualising Earth science data
++description = A powerful, format-agnostic, community-driven Python package for analysing and visualising Earth science data
+ download_url = https://github.com/SciTools/iris
+ keywords =
+ cf-metadata
+@@ -47,13 +46,13 @@
+ [options]
+ include_package_data = True
+ install_requires =
+- cartopy>=0.18
+- cf-units
++ cartopy>=0.20
++ cf-units>=3
+ cftime>=1.5.0
+ dask[array]>=2
+ matplotlib
+ netcdf4
+- numpy>=1.14
++ numpy>=1.19
+ scipy
+ xxhash
+ packages = find:
+@@ -84,9 +83,8 @@
+ requests
+ all =
+ mo_pack
+- nc-time-axis
++ nc-time-axis>=1.3
+ pandas
+- pyugrid
+ stratify
+ %(docs)s
+ %(test)s
+@@ -98,6 +96,7 @@
+ # https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes
+
+ max-line-length = 80
++max-complexity = 50
+ select = C,E,F,W,B,B950
+ ignore =
+ # E203: whitespace before ':'
diff --git a/recipe/build_base.bat b/recipe/build_base.bat
deleted file mode 100644
index b8c1901..0000000
--- a/recipe/build_base.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-rmdir lib\iris\tests\results /s /q
-del lib\iris\tests\*.npz
-
-%PYTHON% -m pip install --no-deps --ignore-installed .
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index a92d6a7..0566fb8 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -7,21 +7,23 @@ package:
source:
url: https://github.com/SciTools/iris/archive/v{{ version }}.tar.gz
sha256: 7c825ccc3bd823c6c66f8dc2bc98e56f84e41a0bd4cd2e9ac1b51930ad59c6a3
+ patches:
+ # can be dropped next release
+ - backport-4418.patch
build:
- number: 1
- skip: true # [py<37]
+ noarch: python
+ number: 2
outputs:
- name: iris
- script: build_base.sh # [not win]
- script: build_base.bat # [win]
+ script: build_base.sh
requirements:
host:
- - python
+ - python >=3.6
- pip
run:
- - python
+ - python >=3.6
- cartopy >=0.18
- cf-units
- cftime >=1.5.0
@@ -62,3 +64,4 @@ extra:
- corinnebosley
- lbdreyer
- pp-mo
+ - jamesp