From 4e5b9f5e984171758b33006e2ef088752dcfb683 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 21 Dec 2021 20:25:48 +0000 Subject: [PATCH 1/2] Rebuild for python310 --- .ci_support/migrations/python310.yaml | 34 +++++++++++++++++++++++++++ recipe/meta.yaml | 8 +++---- 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 .ci_support/migrations/python310.yaml diff --git a/.ci_support/migrations/python310.yaml b/.ci_support/migrations/python310.yaml new file mode 100644 index 0000000..c31e991 --- /dev/null +++ b/.ci_support/migrations/python310.yaml @@ -0,0 +1,34 @@ +migrator_ts: 1634137107 +__migrator: + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.10.* *_cpython # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + paused: false + longterm: True + pr_limit: 40 + max_solver_attempts: 10 # this will make the bot retry "not solvable" stuff 10 times + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.10.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.21 +python_impl: + - cpython diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bde5fdd..cefbe26 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -29,7 +29,7 @@ source: {% set lc, vs, ve, prefix, parbuild = "\\", "$", "", "$PREFIX", "-j $CPU_COUNT" %} # [unix] {% set lc, vs, ve, prefix, parbuild = "^", "%", "%", "%LIBRARY_PREFIX%", "" %} # [win] build: - number: 3 + number: 4 features: - blas_{{ blas_variant }} # [not win] skip: true # [win32 or (win and vc<14)] @@ -44,7 +44,7 @@ build: pylib=$(ldd $PYTHON | grep $PREFIX | grep 'libpython.*\.so' | cut -d' ' -f3) # [linux] cmake .. {{ lc }} - -G"{{vs}}CMAKE_GENERATOR{{ve}}" {{ lc }} + -G"{{ vs }}CMAKE_GENERATOR{{ ve }}" {{ lc }} -DCMAKE_PREFIX_PATH="{{ prefix }}" {{ lc }} -DCMAKE_INSTALL_PREFIX="{{ prefix }}" {{ lc }} -DCMAKE_BUILD_TYPE=Release {{ lc }} @@ -53,7 +53,7 @@ build: -DENABLE_TESTING=OFF {{ lc }} -DENABLE_COVERAGE=OFF {{ lc }} -DUSE_SVMLIGHT=OFF {{ lc }} - -DPYTHON_EXECUTABLE={{vs}}PYTHON{{ve}} {{ lc }} + -DPYTHON_EXECUTABLE={{ vs }}PYTHON{{ ve }} {{ lc }} -DPYTHON_INCLUDE_DIR=$pyinc \ # [unix] -DPYTHON_LIBRARY=$pylib \ # [unix] -DLIBSHOGUN=OFF {{ lc }} @@ -117,8 +117,6 @@ test: imports: - shogun commands: - - conda inspect linkages -p $PREFIX shogun # [not win] - - conda inspect objects -p $PREFIX shogun # [osx] about: home: http://shogun.ml From 3593f38c323b61db58a8f0ba7633b2863ccd238a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Tue, 21 Dec 2021 20:26:12 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.16.0, and conda-forge-pinning 2021.12.21.14.59.39 --- .azure-pipelines/azure-pipelines-linux.yml | 45 +++++++--- .azure-pipelines/azure-pipelines-osx.yml | 33 ++++--- .azure-pipelines/azure-pipelines-win.yml | 49 ++++++----- ...ux_64_numpy1.18python3.7.____cpython.yaml} | 31 ++++--- ...ux_64_numpy1.18python3.8.____cpython.yaml} | 33 ++++--- ...nux_64_numpy1.19python3.9.____cpython.yaml | 75 ++++++++++++++++ ...ux_64_numpy1.21python3.10.____cpython.yaml | 75 ++++++++++++++++ ...sx_64_numpy1.18python3.7.____cpython.yaml} | 29 ++++--- ...sx_64_numpy1.18python3.8.____cpython.yaml} | 31 ++++--- ...osx_64_numpy1.19python3.9.____cpython.yaml | 75 ++++++++++++++++ ...sx_64_numpy1.21python3.10.____cpython.yaml | 75 ++++++++++++++++ ...in_64_numpy1.18python3.7.____cpython.yaml} | 11 ++- ...in_64_numpy1.18python3.8.____cpython.yaml} | 13 ++- ...win_64_numpy1.19python3.9.____cpython.yaml | 55 ++++++++++++ ...in_64_numpy1.21python3.10.____cpython.yaml | 55 ++++++++++++ .gitattributes | 3 +- .scripts/build_steps.sh | 50 +++++++++-- .scripts/logging_utils.sh | 35 ++++++++ .scripts/run_docker_build.sh | 46 ++++++++-- .scripts/run_osx_build.sh | 76 +++++++++------- LICENSE.txt | 2 +- README.md | 86 ++++++++++++++----- azure-pipelines.yml | 4 +- build-locally.py | 44 +++++++++- 24 files changed, 856 insertions(+), 175 deletions(-) rename .ci_support/{linux_python3.7.____cpython.yaml => linux_64_numpy1.18python3.7.____cpython.yaml} (71%) rename .ci_support/{linux_python3.6.____cpython.yaml => linux_64_numpy1.18python3.8.____cpython.yaml} (69%) create mode 100644 .ci_support/linux_64_numpy1.19python3.9.____cpython.yaml create mode 100644 .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename .ci_support/{osx_python3.7.____cpython.yaml => osx_64_numpy1.18python3.7.____cpython.yaml} (78%) rename .ci_support/{osx_python3.6.____cpython.yaml => osx_64_numpy1.18python3.8.____cpython.yaml} (76%) create mode 100644 .ci_support/osx_64_numpy1.19python3.9.____cpython.yaml create mode 100644 .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename .ci_support/{win_python3.7.____cpython.yaml => win_64_numpy1.18python3.7.____cpython.yaml} (84%) rename .ci_support/{win_python3.6.____cpython.yaml => win_64_numpy1.18python3.8.____cpython.yaml} (81%) create mode 100644 .ci_support/win_64_numpy1.19python3.9.____cpython.yaml create mode 100644 .ci_support/win_64_numpy1.21python3.10.____cpython.yaml create mode 100644 .scripts/logging_utils.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f2765a7..c3d867d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -5,20 +5,33 @@ jobs: - job: linux pool: - vmImage: ubuntu-16.04 - timeoutInMinutes: 360 + vmImage: ubuntu-latest strategy: - maxParallel: 8 matrix: - linux_python3.6.____cpython: - CONFIG: linux_python3.6.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_python3.7.____cpython: - CONFIG: linux_python3.7.____cpython - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 + linux_64_numpy1.18python3.7.____cpython: + CONFIG: linux_64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.18python3.8.____cpython: + CONFIG: linux_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.19python3.9.____cpython: + CONFIG: linux_64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.21python3.10.____cpython: + CONFIG: linux_64_numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + timeoutInMinutes: 360 + steps: + - script: | + rm -rf /opt/ghc + df -h + displayName: Manage disk space + # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | @@ -30,7 +43,15 @@ jobs: - script: | 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: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file + 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-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 3b064bf..7d1f525 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,17 +5,22 @@ jobs: - job: osx pool: - vmImage: macOS-10.14 - timeoutInMinutes: 360 + vmImage: macOS-10.15 strategy: - maxParallel: 8 matrix: - osx_python3.6.____cpython: - CONFIG: osx_python3.6.____cpython - UPLOAD_PACKAGES: True - osx_python3.7.____cpython: - CONFIG: osx_python3.7.____cpython - UPLOAD_PACKAGES: True + osx_64_numpy1.18python3.7.____cpython: + CONFIG: osx_64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.18python3.8.____cpython: + CONFIG: osx_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.19python3.9.____cpython: + CONFIG: osx_64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + osx_64_numpy1.21python3.10.____cpython: + CONFIG: osx_64_numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 steps: # TODO: Fast finish on azure pipelines? @@ -23,7 +28,15 @@ jobs: export CI=azure export OSX_FORCE_SDK_DOWNLOAD="1" 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_osx_build.sh displayName: Run OSX build env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file + 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 index e0eea7a..285e7f0 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,25 +5,26 @@ jobs: - job: win pool: - vmImage: vs2017-win2016 - timeoutInMinutes: 360 + vmImage: windows-2019 strategy: - maxParallel: 4 matrix: - win_python3.6.____cpython: - CONFIG: win_python3.6.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - win_python3.7.____cpython: - CONFIG: win_python3.7.____cpython - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: True - steps: - # TODO: Fast finish on azure pipelines? - - script: | - ECHO ON - + win_64_numpy1.18python3.7.____cpython: + CONFIG: win_64_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.18python3.8.____cpython: + CONFIG: win_64_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.19python3.9.____cpython: + CONFIG: win_64_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + win_64_numpy1.21python3.10.____cpython: + CONFIG: win_64_numpy1.21python3.10.____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') @@ -60,7 +61,7 @@ jobs: - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.6 conda-build conda conda-forge::conda-forge-ci-setup=3 pip' # Optional + packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment @@ -94,17 +95,25 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + 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 + 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 .\ ".\recipe" .ci_support\%CONFIG%.yaml + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/linux_python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml similarity index 71% rename from .ci_support/linux_python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml index d56cb1e..365f5c1 100644 --- a/.ci_support/linux_python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml @@ -1,13 +1,15 @@ arpack: -- 3.6.3 +- '3.7' bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main curl: @@ -15,25 +17,25 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 glpk: - '4.65' hdf5: -- 1.10.5 +- 1.10.6 json_c: -- '0.13' +- '0.15' libprotobuf: -- '3.11' +- '3.18' libxml2: - '2.9' lzo: - '2' numpy: -- '1.14' +- '1.18' openblas: -- 0.3.6 +- 0.3.* pin_run_as_build: arpack: max_pin: x.x.x @@ -49,8 +51,6 @@ pin_run_as_build: max_pin: x.x lzo: max_pin: x - openblas: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x @@ -62,7 +62,14 @@ python: - 3.7.* *_cpython snappy: - '1' +target_platform: +- linux-64 xz: - '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy zlib: - '1.2' diff --git a/.ci_support/linux_python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml similarity index 69% rename from .ci_support/linux_python3.6.____cpython.yaml rename to .ci_support/linux_64_numpy1.18python3.8.____cpython.yaml index e7b2e5f..9e7b28e 100644 --- a/.ci_support/linux_python3.6.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml @@ -1,13 +1,15 @@ arpack: -- 3.6.3 +- '3.7' bzip2: - '1' c_compiler: - gcc c_compiler_version: -- '7' +- '9' +cdt_name: +- cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main curl: @@ -15,25 +17,25 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '7' +- '9' docker_image: -- condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 glpk: - '4.65' hdf5: -- 1.10.5 +- 1.10.6 json_c: -- '0.13' +- '0.15' libprotobuf: -- '3.11' +- '3.18' libxml2: - '2.9' lzo: - '2' numpy: -- '1.14' +- '1.18' openblas: -- 0.3.6 +- 0.3.* pin_run_as_build: arpack: max_pin: x.x.x @@ -49,8 +51,6 @@ pin_run_as_build: max_pin: x.x lzo: max_pin: x - openblas: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x @@ -59,10 +59,17 @@ pin_run_as_build: zlib: max_pin: x.x python: -- 3.6.* *_cpython +- 3.8.* *_cpython snappy: - '1' +target_platform: +- linux-64 xz: - '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy zlib: - '1.2' diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml new file mode 100644 index 0000000..4c1dd40 --- /dev/null +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,75 @@ +arpack: +- '3.7' +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +glpk: +- '4.65' +hdf5: +- 1.10.6 +json_c: +- '0.15' +libprotobuf: +- '3.18' +libxml2: +- '2.9' +lzo: +- '2' +numpy: +- '1.19' +openblas: +- 0.3.* +pin_run_as_build: + arpack: + max_pin: x.x.x + bzip2: + max_pin: x + curl: + max_pin: x + glpk: + max_pin: x.x + json-c: + max_pin: x.x + libxml2: + max_pin: x.x + lzo: + max_pin: x + python: + min_pin: x.x + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.9.* *_cpython +snappy: +- '1' +target_platform: +- linux-64 +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 0000000..8407d8e --- /dev/null +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,75 @@ +arpack: +- '3.7' +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +glpk: +- '4.65' +hdf5: +- 1.10.6 +json_c: +- '0.15' +libprotobuf: +- '3.18' +libxml2: +- '2.9' +lzo: +- '2' +numpy: +- '1.21' +openblas: +- 0.3.* +pin_run_as_build: + arpack: + max_pin: x.x.x + bzip2: + max_pin: x + curl: + max_pin: x + glpk: + max_pin: x.x + json-c: + max_pin: x.x + libxml2: + max_pin: x.x + lzo: + max_pin: x + python: + min_pin: x.x + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +snappy: +- '1' +target_platform: +- linux-64 +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/osx_python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml similarity index 78% rename from .ci_support/osx_python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index aba0044..869b487 100644 --- a/.ci_support/osx_python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -1,15 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' arpack: -- 3.6.3 +- '3.7' bzip2: - '1' c_compiler: - clang c_compiler_version: -- '9' +- '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main curl: @@ -17,27 +17,25 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '9' +- '11' glpk: - '4.65' hdf5: -- 1.10.5 +- 1.10.6 json_c: -- '0.13' +- '0.15' libprotobuf: -- '3.11' +- '3.18' libxml2: - '2.9' lzo: - '2' macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: -- '1.14' +- '1.18' openblas: -- 0.3.6 +- 0.3.* pin_run_as_build: arpack: max_pin: x.x.x @@ -53,8 +51,6 @@ pin_run_as_build: max_pin: x.x lzo: max_pin: x - openblas: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x @@ -66,7 +62,14 @@ python: - 3.7.* *_cpython snappy: - '1' +target_platform: +- osx-64 xz: - '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy zlib: - '1.2' diff --git a/.ci_support/osx_python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml similarity index 76% rename from .ci_support/osx_python3.6.____cpython.yaml rename to .ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index f06a2a9..6aa4006 100644 --- a/.ci_support/osx_python3.6.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -1,15 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' arpack: -- 3.6.3 +- '3.7' bzip2: - '1' c_compiler: - clang c_compiler_version: -- '9' +- '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main curl: @@ -17,27 +17,25 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '9' +- '11' glpk: - '4.65' hdf5: -- 1.10.5 +- 1.10.6 json_c: -- '0.13' +- '0.15' libprotobuf: -- '3.11' +- '3.18' libxml2: - '2.9' lzo: - '2' macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' numpy: -- '1.14' +- '1.18' openblas: -- 0.3.6 +- 0.3.* pin_run_as_build: arpack: max_pin: x.x.x @@ -53,8 +51,6 @@ pin_run_as_build: max_pin: x.x lzo: max_pin: x - openblas: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x @@ -63,10 +59,17 @@ pin_run_as_build: zlib: max_pin: x.x python: -- 3.6.* *_cpython +- 3.8.* *_cpython snappy: - '1' +target_platform: +- osx-64 xz: - '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy zlib: - '1.2' diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml new file mode 100644 index 0000000..82df833 --- /dev/null +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,75 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +arpack: +- '3.7' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +glpk: +- '4.65' +hdf5: +- 1.10.6 +json_c: +- '0.15' +libprotobuf: +- '3.18' +libxml2: +- '2.9' +lzo: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.19' +openblas: +- 0.3.* +pin_run_as_build: + arpack: + max_pin: x.x.x + bzip2: + max_pin: x + curl: + max_pin: x + glpk: + max_pin: x.x + json-c: + max_pin: x.x + libxml2: + max_pin: x.x + lzo: + max_pin: x + python: + min_pin: x.x + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.9.* *_cpython +snappy: +- '1' +target_platform: +- osx-64 +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 0000000..4412566 --- /dev/null +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,75 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.9' +arpack: +- '3.7' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +glpk: +- '4.65' +hdf5: +- 1.10.6 +json_c: +- '0.15' +libprotobuf: +- '3.18' +libxml2: +- '2.9' +lzo: +- '2' +macos_machine: +- x86_64-apple-darwin13.4.0 +numpy: +- '1.21' +openblas: +- 0.3.* +pin_run_as_build: + arpack: + max_pin: x.x.x + bzip2: + max_pin: x + curl: + max_pin: x + glpk: + max_pin: x.x + json-c: + max_pin: x.x + libxml2: + max_pin: x.x + lzo: + max_pin: x + python: + min_pin: x.x + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +snappy: +- '1' +target_platform: +- osx-64 +xz: +- '5.2' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml similarity index 84% rename from .ci_support/win_python3.7.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.7.____cpython.yaml index 44c165b..80e515a 100644 --- a/.ci_support/win_python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main curl: @@ -13,13 +13,13 @@ cxx_compiler: glpk: - '4.65' hdf5: -- 1.10.5 +- 1.10.6 libxml2: - '2.9' lzo: - '2' numpy: -- '1.14' +- '1.18' pin_run_as_build: bzip2: max_pin: x @@ -42,9 +42,14 @@ python: - 3.7.* *_cpython snappy: - '1' +target_platform: +- win-64 vc: - '14' xz: - '5.2' +zip_keys: +- - python + - numpy zlib: - '1.2' diff --git a/.ci_support/win_python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml similarity index 81% rename from .ci_support/win_python3.6.____cpython.yaml rename to .ci_support/win_64_numpy1.18python3.8.____cpython.yaml index db345bd..bc5c8a7 100644 --- a/.ci_support/win_python3.6.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml @@ -3,7 +3,7 @@ bzip2: c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main curl: @@ -13,13 +13,13 @@ cxx_compiler: glpk: - '4.65' hdf5: -- 1.10.5 +- 1.10.6 libxml2: - '2.9' lzo: - '2' numpy: -- '1.14' +- '1.18' pin_run_as_build: bzip2: max_pin: x @@ -39,12 +39,17 @@ pin_run_as_build: zlib: max_pin: x.x python: -- 3.6.* *_cpython +- 3.8.* *_cpython snappy: - '1' +target_platform: +- win-64 vc: - '14' xz: - '5.2' +zip_keys: +- - python + - numpy zlib: - '1.2' diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml new file mode 100644 index 0000000..ad6e470 --- /dev/null +++ b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml @@ -0,0 +1,55 @@ +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- vs2017 +glpk: +- '4.65' +hdf5: +- 1.10.6 +libxml2: +- '2.9' +lzo: +- '2' +numpy: +- '1.19' +pin_run_as_build: + bzip2: + max_pin: x + curl: + max_pin: x + glpk: + max_pin: x.x + libxml2: + max_pin: x.x + lzo: + max_pin: x + python: + min_pin: x.x + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.9.* *_cpython +snappy: +- '1' +target_platform: +- win-64 +vc: +- '14' +xz: +- '5.2' +zip_keys: +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 0000000..f140dd8 --- /dev/null +++ b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,55 @@ +bzip2: +- '1' +c_compiler: +- vs2017 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- vs2017 +glpk: +- '4.65' +hdf5: +- 1.10.6 +libxml2: +- '2.9' +lzo: +- '2' +numpy: +- '1.21' +pin_run_as_build: + bzip2: + max_pin: x + curl: + max_pin: x + glpk: + max_pin: x.x + libxml2: + max_pin: x.x + lzo: + max_pin: x + python: + min_pin: x.x + max_pin: x.x + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.10.* *_cpython +snappy: +- '1' +target_platform: +- win-64 +vc: +- '14' +xz: +- '5.2' +zip_keys: +- - python + - numpy +zlib: +- '1.2' diff --git a/.gitattributes b/.gitattributes index ac943c1..ce52713 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,7 +17,8 @@ bld.bat text eol=crlf .gitattributes linguist-generated=true .gitignore linguist-generated=true .travis.yml linguist-generated=true -.scripts 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/.scripts/build_steps.sh b/.scripts/build_steps.sh index 5b14787..ff01283 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,9 +5,18 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail -export PYTHONUNBUFFERED=1 export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" +source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh + + +( endgroup "Start Docker" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null + +export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" @@ -19,8 +28,9 @@ conda-build: CONDARC -conda install --yes --quiet conda-forge-ci-setup=3 conda-build pip -c conda-forge +mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -30,11 +40,39 @@ 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" -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + +( endgroup "Configuring conda" ) 2> /dev/null + +if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then + if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" + fi + conda debug "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + + # Drop into an interactive shell + /bin/bash +else + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + --suppress-variables ${EXTRA_CB_OPTIONS:-} \ + --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" + ( 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" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then + upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" + fi + + ( endgroup "Uploading packages" ) 2> /dev/null fi +( startgroup "Final checks" ) 2> /dev/null + touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh new file mode 100644 index 0000000..57bc95c --- /dev/null +++ b/.scripts/logging_utils.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Provide a unified interface for the different logging +# utilities CI providers offer. If unavailable, provide +# a compatible fallback (e.g. bare `echo xxxxxx`). + +function startgroup { + # Start a foldable group of log lines + # Pass a single argument, quoted + case ${CI:-} in + azure ) + echo "##[group]$1";; + travis ) + echo "$1" + echo -en 'travis_fold:start:'"${1// /}"'\\r';; + github_actions ) + echo "::group::$1";; + * ) + echo "$1";; + esac +} 2> /dev/null + +function endgroup { + # End a foldable group of log lines + # Pass a single argument, quoted + + case ${CI:-} in + azure ) + echo "##[endgroup]";; + travis ) + echo -en 'travis_fold:end:'"${1// /}"'\\r';; + github_actions ) + echo "::endgroup::";; + esac +} 2> /dev/null diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 253723c..0c6515f 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -5,6 +5,10 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +source .scripts/logging_utils.sh + +( startgroup "Configure Docker" ) 2> /dev/null + set -xeo pipefail THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" @@ -13,6 +17,10 @@ PROVIDER_DIR="$(basename $THISDIR)" FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" +if [ -z ${FEEDSTOCK_NAME} ]; then + export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) +fi + docker info # In order for the conda-build process in the container to write to the mounted @@ -41,10 +49,14 @@ fi if [ -z "${DOCKER_IMAGE}" ]; then 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" + echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Trying to parse with coreutils" + DOCKER_IMAGE=$(cat .ci_support/${CONFIG}.yaml | grep '^docker_image:$' -A 1 | tail -n 1 | cut -b 3-) + if [ "${DOCKER_IMAGE}" = "" ]; then + echo "No docker_image entry found in ${CONFIG}. Falling back to quay.io/condaforge/linux-anvil-comp7" + DOCKER_IMAGE="quay.io/condaforge/linux-anvil-comp7" + fi else - DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )" + DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 quay.io/condaforge/linux-anvil-comp7 )" fi fi @@ -58,20 +70,36 @@ if [ -z "${CI}" ]; then DOCKER_RUN_ARGS="-it ${DOCKER_RUN_ARGS}" fi +( endgroup "Configure Docker" ) 2> /dev/null + +( 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:ro,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ + -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ + -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ - -e BINSTAR_TOKEN \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ - $DOCKER_IMAGE \ + -e FEEDSTOCK_NAME \ + -e CPU_COUNT \ + -e BUILD_WITH_CONDA_DEBUG \ + -e BUILD_OUTPUT_ID \ + -e BINSTAR_TOKEN \ + -e FEEDSTOCK_TOKEN \ + -e STAGING_BINSTAR_TOKEN \ + "${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" \ No newline at end of file +test -f "$DONE_CANARY" + +# This closes the last group opened in `build_steps.sh` +( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 775799b..d10e0c2 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,55 +1,71 @@ #!/usr/bin/env bash -set -x +# -*- mode: jinja-shell -*- + +source .scripts/logging_utils.sh + +set -xe + +MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} + +( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null -echo -e "\n\nInstalling a fresh version of Miniforge." -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:start:install_miniforge\\r' -fi MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" -bash $MINIFORGE_FILE -b -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:end:install_miniforge\\r' -fi +rm -rf ${MINIFORGE_HOME} +bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} -echo -e "\n\nConfiguring conda." -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:start:configure_conda\\r' -fi +( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null + +( startgroup "Configuring conda" ) 2> /dev/null -source ${HOME}/miniforge3/etc/profile.d/conda.sh +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 +mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa echo -e "\n\nSetting up the condarc and mangling the compiler." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml -mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -echo -e "\n\nMangling homebrew in the CI to avoid conflicts." -/usr/bin/sudo mangle_homebrew -/usr/bin/sudo -k +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 -if [[ ${CI} == "travis" ]]; then - echo -en 'travis_fold:end:configure_conda\\r' -fi -set -e +( endgroup "Configuring conda" ) 2> /dev/null + -echo -e "\n\nMaking the build clobber file and running the build." +echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml -conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then - echo -e "\n\nUploading the packages." - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml -fi \ No newline at end of file +conda mambabuild ./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" ]] && [[ "${IS_PR_BUILD}" == "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/LICENSE.txt b/LICENSE.txt index cba42cf..ed3f451 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ BSD 3-clause license -Copyright (c) 2015-2019, conda-forge +Copyright (c) 2015-2021, conda-forge contributors All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 30cc143..4eb1204 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,14 @@ Home: http://shogun.ml Package license: GPL-3.0 -Feedstock license: BSD 3-Clause +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/shogun-feedstock/blob/master/LICENSE.txt) Summary: Unified and efficient Machine Learning +Development: https://github.com/shogun-toolbox/shogun/wiki + +Documentation: http://shogun.ml/examples/latest/index.html + The Shogun Machine learning toolbox offers a wide range of efficient and unified Machine Learning methods. @@ -31,45 +35,87 @@ Current build status - + + + + + + + + + + + + + + + + - + - + - + - + - + + + + @@ -78,12 +124,6 @@ Current build status - - - -
VariantStatus
linux_python3.6.____cpythonlinux_64_numpy1.18python3.7.____cpython + + variant + +
linux_64_numpy1.18python3.8.____cpython + + variant + +
linux_64_numpy1.19python3.9.____cpython + + variant + +
linux_64_numpy1.21python3.10.____cpython + + variant + +
osx_64_numpy1.18python3.7.____cpython + + variant + +
osx_64_numpy1.18python3.8.____cpython - variant + variant
linux_python3.7.____cpythonosx_64_numpy1.19python3.9.____cpython - variant + variant
osx_python3.6.____cpythonosx_64_numpy1.21python3.10.____cpython - variant + variant
osx_python3.7.____cpythonwin_64_numpy1.18python3.7.____cpython - variant + variant
win_python3.6.____cpythonwin_64_numpy1.18python3.8.____cpython - variant + variant
win_python3.7.____cpythonwin_64_numpy1.19python3.9.____cpython - variant + variant + +
win_64_numpy1.21python3.10.____cpython + + variant
Linux_ppc64le - ppc64le disabled -
Current release info @@ -100,6 +140,7 @@ Installing `shogun` from the `conda-forge` channel can be achieved by adding `co ``` conda config --add channels conda-forge +conda config --set channel_priority strict ``` Once the `conda-forge` channel has been enabled, `shogun` can be installed with: @@ -118,7 +159,8 @@ conda search shogun --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) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](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 @@ -170,9 +212,9 @@ build distinct package versions. In order to produce a uniquely identifiable distribution: * If the version of a package **is not** being increased, please add or increase - the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string). + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string). * 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) + the [``build/number``](https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#build-number-and-string) back to 0. Feedstock Maintainers diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da..6b346f5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ 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 + - template: ./.azure-pipelines/azure-pipelines-win.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 8f7ecca..8b74348 100755 --- a/build-locally.py +++ b/build-locally.py @@ -7,11 +7,25 @@ import glob import subprocess from argparse import ArgumentParser +import platform 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: + os.environ["BUILD_OUTPUT_ID"] = ns.output_id + if "MINIFORGE_HOME" not in os.environ: + 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): @@ -19,6 +33,11 @@ def run_docker_build(ns): subprocess.check_call([script]) +def run_osx_build(ns): + script = ".scripts/run_osx_build.sh" + subprocess.check_call([script]) + + def verify_config(ns): valid_configs = { os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") @@ -42,21 +61,40 @@ def verify_config(ns): else: raise ValueError("config " + ns.config + " is not valid") # Remove the following, as implemented - if not ns.config.startswith("linux"): + if ns.config.startswith("win"): raise ValueError( - f"only Linux configs currently supported, got {ns.config}" + f"only Linux/macOS configs currently supported, got {ns.config}" ) + elif ns.config.startswith("osx") and platform.system() == "Darwin": + if "OSX_SDK_DIR" not in os.environ: + raise RuntimeError( + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=/opt'" + "to download the SDK automatically to '/opt/MacOSX.sdk'" + ) def main(args=None): p = ArgumentParser("build-locally") p.add_argument("config", default=None, nargs="?") + p.add_argument( + "--debug", + action="store_true", + help="Setup debug environment using `conda debug`", + ) + p.add_argument( + "--output-id", help="If running debug, specify the output to setup." + ) ns = p.parse_args(args=args) verify_config(ns) setup_environment(ns) - run_docker_build(ns) + if ns.config.startswith("linux") or ( + ns.config.startswith("osx") and platform.system() == "Linux" + ): + run_docker_build(ns) + elif ns.config.startswith("osx"): + run_osx_build(ns) if __name__ == "__main__":