diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index da208bd..a21dfd3 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,20 +10,16 @@ jobs: strategy: maxParallel: 8 matrix: - linux_python2.7: - CONFIG: linux_python2.7 + linux_python3.6.____cpython: + CONFIG: linux_python3.6.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_python3.6: - CONFIG: linux_python3.6 + linux_python3.7.____cpython: + CONFIG: linux_python3.7.____cpython 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 - linux_python3.8: - CONFIG: linux_python3.8 + linux_python3.8.____cpython: + CONFIG: linux_python3.8.____cpython UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d08eca1..e864659 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,22 +5,19 @@ jobs: - job: osx pool: - vmImage: macOS-10.13 + vmImage: macOS-10.14 timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: - osx_python2.7: - CONFIG: osx_python2.7 + osx_python3.6.____cpython: + CONFIG: osx_python3.6.____cpython UPLOAD_PACKAGES: True - osx_python3.6: - CONFIG: osx_python3.6 + osx_python3.7.____cpython: + CONFIG: osx_python3.7.____cpython UPLOAD_PACKAGES: True - osx_python3.7: - CONFIG: osx_python3.7 - UPLOAD_PACKAGES: True - osx_python3.8: - CONFIG: osx_python3.8 + osx_python3.8.____cpython: + CONFIG: osx_python3.8.____cpython UPLOAD_PACKAGES: True steps: @@ -51,7 +48,7 @@ jobs: source activate base echo "Configuring conda." - setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml + 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 @@ -62,24 +59,24 @@ jobs: - script: | source activate base - mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml + mangle_compiler ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Mangle compiler - script: | source activate base - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml + make_build_number ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Generate build number clobber file - script: | source activate base - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + conda build "./recipe" -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml displayName: Build recipe - script: | source activate base export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + upload_package ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) - condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file + condition: and(succeeded(), 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 8e16055..06d5476 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -10,16 +10,16 @@ jobs: strategy: maxParallel: 4 matrix: - win_c_compilervs2015python3.6: - CONFIG: win_c_compilervs2015python3.6 + win_python3.6.____cpython: + CONFIG: win_python3.6.____cpython CONDA_BLD_PATH: D:\\bld\\ UPLOAD_PACKAGES: True - win_c_compilervs2015python3.7: - CONFIG: win_c_compilervs2015python3.7 + win_python3.7.____cpython: + CONFIG: win_python3.7.____cpython CONDA_BLD_PATH: D:\\bld\\ UPLOAD_PACKAGES: True - win_c_compilervs2015python3.8: - CONFIG: win_c_compilervs2015python3.8 + win_python3.8.____cpython: + CONFIG: win_python3.8.____cpython CONDA_BLD_PATH: D:\\bld\\ UPLOAD_PACKAGES: True steps: @@ -66,13 +66,13 @@ jobs: inputs: packageSpecs: 'python=3.6 conda-build conda conda-forge::conda-forge-ci-setup=2' # Optional installOptions: "-c conda-forge" - updateConda: false + updateConda: true displayName: Install conda-build and activate environment - script: set PYTHONUNBUFFERED=1 # Configure the VM - - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml + - script: setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml # Configure the VM. - script: | @@ -88,7 +88,7 @@ jobs: # Special cased version setting some more things! - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml + 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" @@ -96,7 +96,7 @@ jobs: condition: contains(variables['CONFIG'], 'vs2008') - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml displayName: Build recipe env: PYTHONUNBUFFERED: 1 @@ -104,8 +104,8 @@ jobs: - script: | set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + upload_package .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) - condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python3.6.____cpython.yaml similarity index 93% rename from .ci_support/linux_python2.7.yaml rename to .ci_support/linux_python3.6.____cpython.yaml index b63f737..a5c03b0 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_python3.6.____cpython.yaml @@ -15,4 +15,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '2.7' +- 3.6.* *_cpython diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.7.____cpython.yaml similarity index 93% rename from .ci_support/linux_python3.6.yaml rename to .ci_support/linux_python3.7.____cpython.yaml index 60773f0..1264d8b 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.7.____cpython.yaml @@ -15,4 +15,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.6' +- 3.7.* *_cpython diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.8.____cpython.yaml similarity index 93% rename from .ci_support/linux_python3.7.yaml rename to .ci_support/linux_python3.8.____cpython.yaml index f7c6291..01dc1a5 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.8.____cpython.yaml @@ -15,4 +15,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.7' +- 3.8.* *_cpython diff --git a/.ci_support/linux_python3.8.yaml b/.ci_support/linux_python3.8.yaml deleted file mode 100644 index 1202817..0000000 --- a/.ci_support/linux_python3.8.yaml +++ /dev/null @@ -1,18 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil-comp7 -numpy: -- '1.14' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.8' diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python3.6.____cpython.yaml similarity index 94% rename from .ci_support/osx_python2.7.yaml rename to .ci_support/osx_python3.6.____cpython.yaml index de200ce..728febd 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_python3.6.____cpython.yaml @@ -19,4 +19,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '2.7' +- 3.6.* *_cpython diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.7.____cpython.yaml similarity index 94% rename from .ci_support/osx_python3.6.yaml rename to .ci_support/osx_python3.7.____cpython.yaml index 19ccc69..476de19 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.7.____cpython.yaml @@ -19,4 +19,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.6' +- 3.7.* *_cpython diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.8.____cpython.yaml similarity index 94% rename from .ci_support/osx_python3.7.yaml rename to .ci_support/osx_python3.8.____cpython.yaml index 67376d9..0cc156e 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_python3.8.____cpython.yaml @@ -19,4 +19,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.7' +- 3.8.* *_cpython diff --git a/.ci_support/osx_python3.8.yaml b/.ci_support/osx_python3.8.yaml deleted file mode 100644 index a4509a3..0000000 --- a/.ci_support/osx_python3.8.yaml +++ /dev/null @@ -1,22 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -numpy: -- '1.14' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.8' diff --git a/.ci_support/win_c_compilervs2015python3.6.yaml b/.ci_support/win_python3.6.____cpython.yaml similarity index 80% rename from .ci_support/win_c_compilervs2015python3.6.yaml rename to .ci_support/win_python3.6.____cpython.yaml index 760283d..bc143cc 100644 --- a/.ci_support/win_c_compilervs2015python3.6.yaml +++ b/.ci_support/win_python3.6.____cpython.yaml @@ -11,7 +11,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.6' -zip_keys: -- - python - - c_compiler +- 3.6.* *_cpython diff --git a/.ci_support/win_c_compilervs2015python3.7.yaml b/.ci_support/win_python3.7.____cpython.yaml similarity index 80% rename from .ci_support/win_c_compilervs2015python3.7.yaml rename to .ci_support/win_python3.7.____cpython.yaml index 012bf6f..acb7756 100644 --- a/.ci_support/win_c_compilervs2015python3.7.yaml +++ b/.ci_support/win_python3.7.____cpython.yaml @@ -11,7 +11,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.7' -zip_keys: -- - python - - c_compiler +- 3.7.* *_cpython diff --git a/.ci_support/win_c_compilervs2015python3.8.yaml b/.ci_support/win_python3.8.____cpython.yaml similarity index 80% rename from .ci_support/win_c_compilervs2015python3.8.yaml rename to .ci_support/win_python3.8.____cpython.yaml index dac6bd8..f57b576 100644 --- a/.ci_support/win_c_compilervs2015python3.8.yaml +++ b/.ci_support/win_python3.8.____cpython.yaml @@ -11,7 +11,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- '3.8' -zip_keys: -- - python - - c_compiler +- 3.8.* *_cpython diff --git a/.gitattributes b/.gitattributes index 86ff937..ac943c1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,6 +17,7 @@ bld.bat text eol=crlf .gitattributes linguist-generated=true .gitignore linguist-generated=true .travis.yml linguist-generated=true +.scripts linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/README.md b/README.md index 3e29fc7..357d2b1 100644 --- a/README.md +++ b/README.md @@ -29,80 +29,66 @@ Current build status - + - + - + - + - + - + - + - + - + - - - - - - @@ -162,7 +148,7 @@ A feedstock is made up of a conda recipe (the instructions on what and how to bu the package) and the necessary configurations for automatic building using freely available continuous integration services. Thanks to the awesome service provided by [CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/) -and [TravisCI](https://travis-ci.org/) it is possible to build and upload installable +and [TravisCI](https://travis-ci.com/) it is possible to build and upload installable packages to the [conda-forge](https://anaconda.org/conda-forge) [Anaconda-Cloud](https://anaconda.org/) channel for Linux, Windows and OSX respectively. diff --git a/conda-forge.yml b/conda-forge.yml index e6baf27..338c17f 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,11 +1,8 @@ appveyor: secure: {BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1} -compiler_stack: comp7 -max_py_ver: '37' -max_r_ver: '35' travis: secure: {BINSTAR_TOKEN: yg1xN+yTAUlolljIJNIRUDv82hVxEddWU5Nr+kI0fnBeV5iUTKcEsJFhkQRiDZlMCJcYNYXZ1kUmBFR05kGa6HaWj09hTLmnWCWaPe+3bK1RyX5wLsOSRwuBz//ibM0O26qJC2Ao6P4V3bF8/6gK3PCK7EbTl67jambJ+aAJxWYGUJcjKEcSuvrtFzj9fQtGOelETndbUrAPgmvszcsggM5zMFt4KhduzVX1wew1qoifqnin0Mi0LymYFxv/sT81CWK1bbRtuAHHiPNnXLgSKi86ZhTofVbn9IyfSNQ6l/n+x3xJWbbSq1oRijz6p/m4UAnuwZU8vBK6HlPBgmrfAB4V9zyzr4wQyWYiQs5wg70EWzX902wtWwHZc0KeTU6Ezo9mtya8w1M+amFEeHp8Hyl0D+NpiD4cB08pqsFyTX0YQd8rI5qqMlD5aPx9LrDJ4RlimMSUE+aij2kR2NSth1e2yHOoHKETdD7C9jyX/ivbHaqJYF7T6N/fF7x9siBAIoqHUIdtrX9nrSD3ZxsdJnrMfERbBG8UVsZI5uC9cGERIbPONzh9jMQFMc6Qhqezr/uJ4iWtm/X7nUuncBvEaoSZ8NHMq0cNdbnzD1zEmC37Bi7JHKcEXDPgevp/RfJKBFe6EpbfRgRHK8//ObV1mBd8xnXZV+qitzH6qngIsws=} provider: osx: azure linux: azure - win: azure \ No newline at end of file + win: azure diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 102d790..75ce16a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.1.3" %} +{% set version = "2.1.4" %} package: name: cf-units @@ -6,11 +6,11 @@ package: source: url: https://pypi.io/packages/source/c/cf-units/cf-units-{{ version }}.tar.gz - sha256: dbe11072fd4aedef4c84ebd94514837985872ec9e5c5fc7517ffb35b310778d7 + sha256: 25f81ad994af30713ee8f5ef18ffddd83c6ec1ac308e1bd89d45de9d2e0f1c31 build: number: 0 - skip: True # [win and py2k] + skip: true # [win and py2k] requirements: build: @@ -19,6 +19,7 @@ requirements: - python - pip - numpy + - cython - udunits2 # It isn't clear that this really is needed, but it is listed in setup.py. - pytest-runner @@ -33,9 +34,11 @@ requirements: test: requires: - pytest + - pip imports: - cf_units commands: + - pip check - pytest --pyargs cf_units # [not (win and py2k)] # On win py2 we are getting an unexpected test failure. See also # https://github.com/SciTools/cf-units/issues/148. @@ -45,7 +48,7 @@ about: home: https://scitools.org.uk/cf-units/docs/latest/ license: LGPL-3.0 license_file: COPYING.LESSER - summary: 'Units of measure as required by the Climate and Forecast (CF) metadata conventions.' + summary: Units of measure as required by the Climate and Forecast (CF) metadata conventions. extra: recipe-maintainers:
VariantStatus
linux_python2.7linux_python3.6.____cpython - variant + variant
linux_python3.6linux_python3.7.____cpython - variant + variant
linux_python3.7linux_python3.8.____cpython - variant + variant
linux_python3.8osx_python3.6.____cpython - variant + variant
osx_python2.7osx_python3.7.____cpython - variant + variant
osx_python3.6osx_python3.8.____cpython - variant + variant
osx_python3.7win_python3.6.____cpython - variant + variant
osx_python3.8win_python3.7.____cpython - variant + variant
win_c_compilervs2015python3.6win_python3.8.____cpython - variant - -
win_c_compilervs2015python3.7 - - variant - -
win_c_compilervs2015python3.8 - - variant + variant