From 7088ccaa0056ded724e2f999925d2083fa7f0a05 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 3 Jun 2022 00:10:33 +0000 Subject: [PATCH 1/4] Rebuild for gdal35 --- .ci_support/migrations/gdal35.yaml | 9 +++++++++ recipe/meta.yaml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/gdal35.yaml diff --git a/.ci_support/migrations/gdal35.yaml b/.ci_support/migrations/gdal35.yaml new file mode 100644 index 0000000..dfaf5f2 --- /dev/null +++ b/.ci_support/migrations/gdal35.yaml @@ -0,0 +1,9 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +gdal: +- '3.5' +libgdal: +- '3.5' +migrator_ts: 1653326469.7301745 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ffba325..9d7441e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: a8a17c73a5868745fe7ce4ffe01b0ea20745e27438e0851eec68688d875e895c build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage('mdal', max_pin='x.x') }} From de0fe353784417d72f234a3c37f7a31a762cebfd Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 3 Jun 2022 00:11:01 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.20.0, and conda-forge-pinning 2022.06.02.23.44.30 --- .azure-pipelines/azure-pipelines-win.yml | 65 +++++++----------------- .ci_support/linux_64_.yaml | 2 +- .ci_support/osx_64_.yaml | 6 +-- .ci_support/win_64_.yaml | 2 +- .circleci/config.yml | 3 +- README.md | 57 +++++++++++++++------ 6 files changed, 67 insertions(+), 68 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 88fd9c1..09ab551 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -16,45 +16,27 @@ jobs: 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 + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) - Get-ChildItem -Path $batchDir + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge - Get-ChildItem -Path ($batchDir + '\..') + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH - condition: contains(variables['CONFIG'], 'vs2008') - displayName: Patch vs2008 (if needed) - - task: CondaEnvironment@1 - inputs: - packageSpecs: 'python=3.9 conda-build conda pip boa conda-forge-ci-setup=3' # Optional - installOptions: "-c conda-forge" - updateConda: true - displayName: Install conda-build and activate environment + - script: | + call activate base + mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 displayName: Set PYTHONUNBUFFERED @@ -73,23 +55,12 @@ jobs: 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 mambabuild "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 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index ee85272..66c4e2d 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -17,7 +17,7 @@ docker_image: hdf5: - 1.12.1 libgdal: -- '3.4' +- '3.5' libnetcdf: - 4.8.1 libxml2: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a91ec03..733c371 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET: c_compiler: - clang c_compiler_version: -- '12' +- '13' channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '12' +- '13' hdf5: - 1.12.1 libgdal: -- '3.4' +- '3.5' libnetcdf: - 4.8.1 libxml2: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 4de9bbd..2be98c5 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -9,7 +9,7 @@ cxx_compiler: hdf5: - 1.12.1 libgdal: -- '3.4' +- '3.5' libnetcdf: - 4.8.1 libxml2: diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ad461b..3e61aa2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,8 @@ version: 2 jobs: build: working_directory: ~/test - machine: true + machine: + image: ubuntu-2004:current steps: - run: # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. diff --git a/README.md b/README.md index ed16081..82fe8c4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Home: https://www.mdal.xyz/ Package license: MIT -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/mdal-feedstock/blob/master/LICENSE.txt) +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/mdal-feedstock/blob/main/LICENSE.txt) Summary: Mesh Data Abstraction Layer @@ -30,8 +30,8 @@ Current build status
- - + + @@ -39,22 +39,22 @@ Current build status @@ -82,18 +82,43 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `mdal` can be installed with: +Once the `conda-forge` channel has been enabled, `mdal` can be installed with `conda`: ``` conda install mdal ``` -It is possible to list all of the versions of `mdal` available on your platform with: +or with `mamba`: + +``` +mamba install mdal +``` + +It is possible to list all of the versions of `mdal` available on your platform with `conda`: ``` conda search mdal --channel conda-forge ``` +or with `mamba`: + +``` +mamba search mdal --channel conda-forge +``` + +Alternatively, `mamba repoquery` may provide more information: + +``` +# Search all versions available on your platform: +mamba repoquery search mdal --channel conda-forge + +# List packages depending on `mdal`: +mamba repoquery whoneeds mdal --channel conda-forge + +# List dependencies of `mdal`: +mamba repoquery depends mdal --channel conda-forge +``` + About conda-forge ================= @@ -109,10 +134,12 @@ for each of the installable packages. Such a repository is known as a *feedstock A feedstock is made up of a conda recipe (the instructions on what and how to build 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.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. +[Azure](https://azure.microsoft.com/en-us/services/devops/), [GitHub](https://github.com/), +[CircleCI](https://circleci.com/), [AppVeyor](https://www.appveyor.com/), +[Drone](https://cloud.drone.io/welcome), 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. To manage the continuous integration and simplify feedstock maintenance [conda-smithy](https://github.com/conda-forge/conda-smithy) has been developed. From 8a4a969f3997adc165ba63e4d8843fc63d1e28f1 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 3 Jun 2022 10:42:01 +0100 Subject: [PATCH 3/4] Update bld.bat --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 976f6cb..f313915 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -40,7 +40,7 @@ ctest --version set GRIB_ADJUST_LONGITUDE_RANGE=NO -ctest -VV -C Release --exclude-regex "mdal_dynamic*|mdal_api*" +ctest -VV -C Release --exclude-regex "mdal_dynamic*|mdal_api*|mdal_gdal_netcdf*" if errorlevel 1 exit /b 1 cd .. From 28d9d0d7c151ff170774f949a2cf51d7865b7f46 Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 3 Jun 2022 11:05:40 +0100 Subject: [PATCH 4/4] Update build.sh --- recipe/build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index adb8454..bd743b5 100755 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -26,5 +26,4 @@ make install export PATH=$PATH:$PREFIX/lib export GRIB_ADJUST_LONGITUDE_RANGE=NO -ctest -VV - +ctest -VV --exclude-regex "mdal_gdal_netcdf*"
linux_64 - - variant + + variant
osx_64 - - variant + + variant
win_64 - - variant + + variant