diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 9a99e7a..5694e36 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,24 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.20python3.8.____73_pypy: - CONFIG: linux_64_numpy1.20python3.8.____73_pypy + linux_64_numpy1.22python3.10.____cpython: + CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.8.____cpython: - CONFIG: linux_64_numpy1.20python3.8.____cpython + linux_64_numpy1.22python3.8.____cpython: + CONFIG: linux_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____73_pypy: - CONFIG: linux_64_numpy1.20python3.9.____73_pypy + linux_64_numpy1.22python3.9.____73_pypy: + CONFIG: linux_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.20python3.9.____cpython: - CONFIG: linux_64_numpy1.20python3.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 + linux_64_numpy1.22python3.9.____cpython: + CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.23python3.11.____cpython: @@ -35,11 +31,6 @@ jobs: 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: | diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ddd9634..f62c37d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,20 +8,17 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_numpy1.20python3.8.____73_pypy: - CONFIG: osx_64_numpy1.20python3.8.____73_pypy + osx_64_numpy1.22python3.10.____cpython: + CONFIG: osx_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.8.____cpython: - CONFIG: osx_64_numpy1.20python3.8.____cpython + osx_64_numpy1.22python3.8.____cpython: + CONFIG: osx_64_numpy1.22python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____73_pypy: - CONFIG: osx_64_numpy1.20python3.9.____73_pypy + osx_64_numpy1.22python3.9.____73_pypy: + CONFIG: osx_64_numpy1.22python3.9.____73_pypy UPLOAD_PACKAGES: 'True' - osx_64_numpy1.20python3.9.____cpython: - CONFIG: osx_64_numpy1.20python3.9.____cpython - UPLOAD_PACKAGES: 'True' - osx_64_numpy1.21python3.10.____cpython: - CONFIG: osx_64_numpy1.21python3.10.____cpython + osx_64_numpy1.22python3.9.____cpython: + CONFIG: osx_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.23python3.11.____cpython: CONFIG: osx_64_numpy1.23python3.11.____cpython diff --git a/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml deleted file mode 100644 index 9e10cf9..0000000 --- a/.ci_support/linux_64_numpy1.20python3.8.____73_pypy.yaml +++ /dev/null @@ -1,31 +0,0 @@ -boost: -- 1.78.0 -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -liblapack: -- 3.9 *netlib -numpy: -- '1.20' -pin_run_as_build: - boost: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- linux-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index a30e1af..72b9270 100644 --- a/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -1,5 +1,3 @@ -boost: -- 1.78.0 cdt_name: - cos6 channel_sources: @@ -9,16 +7,16 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib numpy: -- '1.21' +- '1.22' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index b68e1d3..53ca4ae 100644 --- a/.ci_support/linux_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml @@ -1,5 +1,3 @@ -boost: -- 1.78.0 cdt_name: - cos6 channel_sources: @@ -9,16 +7,16 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib numpy: -- '1.20' +- '1.22' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml similarity index 85% rename from .ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml index 66cad46..1089743 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,5 +1,3 @@ -boost: -- 1.78.0 cdt_name: - cos6 channel_sources: @@ -9,16 +7,16 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib numpy: -- '1.20' +- '1.22' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml similarity index 85% rename from .ci_support/linux_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 5be7b5c..050ece0 100644 --- a/.ci_support/linux_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -1,5 +1,3 @@ -boost: -- 1.78.0 cdt_name: - cos6 channel_sources: @@ -9,16 +7,16 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib numpy: -- '1.20' +- '1.22' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 5e8b12c..30ef93f 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -1,5 +1,3 @@ -boost: -- 1.78.0 cdt_name: - cos6 channel_sources: @@ -9,16 +7,16 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '10' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib numpy: - '1.23' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/migrations/python311.yaml b/.ci_support/migrations/python311.yaml deleted file mode 100644 index 2715ab2..0000000 --- a/.ci_support/migrations/python311.yaml +++ /dev/null @@ -1,37 +0,0 @@ -migrator_ts: 1666686085 -__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 - - 3.11.* *_cpython # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: True - pr_limit: 30 - 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.11.* *_cpython -# additional entries to add for zip_keys -numpy: - - 1.23 -python_impl: - - cpython diff --git a/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml b/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml deleted file mode 100644 index 8a8a961..0000000 --- a/.ci_support/osx_64_numpy1.20python3.8.____73_pypy.yaml +++ /dev/null @@ -1,33 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -boost: -- 1.78.0 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -liblapack: -- 3.9 *netlib -llvm_openmp: -- '14' -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.20' -pin_run_as_build: - boost: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_73_pypy -target_platform: -- osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml similarity index 85% rename from .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.10.____cpython.yaml index c280ebd..fdd6bd7 100644 --- a/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.10.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -boost: -- 1.78.0 channel_sources: - conda-forge channel_targets: @@ -9,18 +7,18 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib llvm_openmp: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.21' +- '1.22' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml similarity index 85% rename from .ci_support/osx_64_numpy1.20python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.8.____cpython.yaml index 7f62fba..537ecce 100644 --- a/.ci_support/osx_64_numpy1.20python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.8.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -boost: -- 1.78.0 channel_sources: - conda-forge channel_targets: @@ -9,18 +7,18 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib llvm_openmp: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml similarity index 85% rename from .ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml index 36457a0..40a8310 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____73_pypy.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -boost: -- 1.78.0 channel_sources: - conda-forge channel_targets: @@ -9,18 +7,18 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib llvm_openmp: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml similarity index 85% rename from .ci_support/osx_64_numpy1.20python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.22python3.9.____cpython.yaml index 95254e1..a6f9f48 100644 --- a/.ci_support/osx_64_numpy1.20python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.22python3.9.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -boost: -- 1.78.0 channel_sources: - conda-forge channel_targets: @@ -9,18 +7,18 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib llvm_openmp: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.20' +- '1.22' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 8efecbf..11d66e7 100644 --- a/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -1,7 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' -boost: -- 1.78.0 channel_sources: - conda-forge channel_targets: @@ -9,18 +7,18 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' +libboost_python_devel: +- '1.82' liblapack: - 3.9 *netlib llvm_openmp: -- '14' +- '15' macos_machine: - x86_64-apple-darwin13.4.0 numpy: - '1.23' pin_run_as_build: - boost: - max_pin: x.x.x python: min_pin: x.x max_pin: x.x diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a4242..438ed2b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,11 +31,10 @@ pkgs_dirs: CONDARC - -mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh index 57bc95c..aff009f 100644 --- a/.scripts/logging_utils.sh +++ b/.scripts/logging_utils.sh @@ -12,7 +12,7 @@ function startgroup { echo "##[group]$1";; travis ) echo "$1" - echo -en 'travis_fold:start:'"${1// /}"'\\r';; + echo -en 'travis_fold:start:'"${1// /}"'\r';; github_actions ) echo "::group::$1";; * ) @@ -28,7 +28,7 @@ function endgroup { azure ) echo "##[endgroup]";; travis ) - echo -en 'travis_fold:end:'"${1// /}"'\\r';; + echo -en 'travis_fold:end:'"${1// /}"'\r';; github_actions ) echo "::endgroup::";; esac diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index caa788e..0f0ee70 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,10 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" +mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup=3 +mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + pip mamba conda-build boa conda-forge-ci-setup @@ -55,7 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -71,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml diff --git a/README.md b/README.md index a80ce95..433cf3d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About alm -========= +About alm-feedstock +=================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/alm-feedstock/blob/main/LICENSE.txt) Home: https://github.com/ttadano/ALM Package license: MIT -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/alm-feedstock/blob/main/LICENSE.txt) - Summary: Software for calculating harmonic and anharmonic interatomic force constants in solids and molecules. Development: https://github.com/ttadano/ALM @@ -37,38 +37,31 @@ Current build status - - - - + - + - + - + @@ -79,38 +72,31 @@ Current build status - - - - + - + - + - +
VariantStatus
linux_64_numpy1.20python3.8.____73_pypy - - variant - -
linux_64_numpy1.20python3.8.____cpythonlinux_64_numpy1.22python3.10.____cpython - variant + variant
linux_64_numpy1.20python3.9.____73_pypylinux_64_numpy1.22python3.8.____cpython - variant + variant
linux_64_numpy1.20python3.9.____cpythonlinux_64_numpy1.22python3.9.____73_pypy - variant + variant
linux_64_numpy1.21python3.10.____cpythonlinux_64_numpy1.22python3.9.____cpython - variant + variant
osx_64_numpy1.20python3.8.____73_pypy - - variant - -
osx_64_numpy1.20python3.8.____cpythonosx_64_numpy1.22python3.10.____cpython - variant + variant
osx_64_numpy1.20python3.9.____73_pypyosx_64_numpy1.22python3.8.____cpython - variant + variant
osx_64_numpy1.20python3.9.____cpythonosx_64_numpy1.22python3.9.____73_pypy - variant + variant
osx_64_numpy1.21python3.10.____cpythonosx_64_numpy1.22python3.9.____cpython - variant + variant