diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 730a626..7708e23 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index a9cf454..fe79e25 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -48,4 +48,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 47f5302..c5fff1d 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -52,4 +52,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index b909adf..e7b27dd 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -48,4 +48,4 @@ zip_keys: - - c_stdlib_version - cdt_name zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 3dff967..0e9717d 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -45,4 +47,4 @@ target_platform: zeromq: - 4.3.5 zlib: -- '1.2' +- '1' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index b72766d..5d072ee 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -45,4 +47,4 @@ target_platform: zeromq: - 4.3.5 zlib: -- '1.2' +- '1' diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03..a5836e8 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..ba0c879 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/recipe/install-core.sh b/recipe/install-core.sh old mode 100644 new mode 100755 index 4693ab1..01b17cc --- a/recipe/install-core.sh +++ b/recipe/install-core.sh @@ -1,32 +1,14 @@ #!/bin/bash +set -exo pipefail -INSTALL_DIR="$PREFIX/share/gap" - -mkdir -p "$INSTALL_DIR" +source $RECIPE_DIR/install-shared.sh make install -set +e -pushd pkg -# Remove all object files and temporary files. -find . \( \ - -name "*.o" \ - -o -name "*.lo" \ - -o -name "*.la" \ - -o -name "*.lai" \ - -o -name ".libs" \ - -o -name "config.log" \ - -o -name "config.status" \ - -o -name "libtool" \ - \) -exec rm -rf {} \; -popd -echo "done" -set -e - -mkdir -p "$INSTALL_DIR/pkg" -cd pkg -for GAP_PKG_NAME in smallgrp transgrp primgrp gapdoc utils; -do - echo "GAP_PKG_NAME: $GAP_PKG_NAME" - mv $GAP_PKG_NAME $INSTALL_DIR/pkg/$GAP_PKG_NAME +for pkg in smallgrp \ + transgrp \ + primgrp \ + gapdoc \ + utils; do + mv pkg/$pkg $INSTALL_DIR/pkg/$pkg done diff --git a/recipe/install-defaults.sh b/recipe/install-defaults.sh old mode 100644 new mode 100755 index 4aca33c..f8c251c --- a/recipe/install-defaults.sh +++ b/recipe/install-defaults.sh @@ -1,21 +1,7 @@ -INSTALL_DIR="$PREFIX/share/gap" +#!/bin/bash +set -exo pipefail -set +e -pushd pkg -# Remove all object files and temporary files. -find . \( \ - -name "*.o" \ - -o -name "*.lo" \ - -o -name "*.la" \ - -o -name "*.lai" \ - -o -name ".libs" \ - -o -name "config.log" \ - -o -name "config.status" \ - -o -name "libtool" \ - \) -exec rm -rf {} \; - -echo "done" -set -e +source $RECIPE_DIR/install-shared.sh for pkg in atlasrep \ autpgrp \ @@ -32,7 +18,5 @@ for pkg in atlasrep \ resclasses \ sophus \ tomlib ; do - mv $pkg $INSTALL_DIR/pkg/$pkg + mv pkg/$pkg $INSTALL_DIR/pkg/$pkg done - -popd diff --git a/recipe/install-full.sh b/recipe/install-full.sh old mode 100644 new mode 100755 index 22ae8a9..8bb9650 --- a/recipe/install-full.sh +++ b/recipe/install-full.sh @@ -1,28 +1,14 @@ -INSTALL_DIR="$PREFIX/share/gap" +#!/bin/bash +set -exo pipefail -rm -rf "$INSTALL_DIR/pkg" +source $RECIPE_DIR/install-shared.sh -set +e -pushd pkg -# Remove all object files and temporary files. -find . \( \ - -name "*.o" \ - -o -name "*.lo" \ - -o -name "*.la" \ - -o -name "*.lai" \ - -o -name ".libs" \ - -o -name "config.log" \ - -o -name "config.status" \ - -o -name "libtool" \ - \) -exec rm -rf {} \; - -echo "done" -popd -set -e - -mv pkg $INSTALL_DIR/pkg +for pkg in `ls pkg/`; do + mv pkg/$pkg $INSTALL_DIR/pkg/$pkg +done pushd $INSTALL_DIR/pkg/jupyterkernel/ + sed -i.bak "s@ GAP=gap@ GAP=$PREFIX/bin/gap@g" bin/jupyter-kernel-gap rm bin/jupyter-kernel-gap.bak rm setup.py @@ -30,4 +16,5 @@ cp $RECIPE_DIR/setup.py setup.py cp $RECIPE_DIR/gap-mode.json etc/ python -m pip install . --no-deps rm -rf $SP_DIR/gap_jupyter-* + popd diff --git a/recipe/install-shared.sh b/recipe/install-shared.sh new file mode 100755 index 0000000..2ffcbb4 --- /dev/null +++ b/recipe/install-shared.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +INSTALL_DIR="$PREFIX/share/gap" + +mkdir -p "$INSTALL_DIR/pkg" + +# Remove all object files and temporary files. +find pkg \( \ + -name "*.o" \ + -o -name "*.lo" \ + -o -name "*.la" \ + -o -name "*.lai" \ + -o -name ".libs" \ + -o -name "config.log" \ + -o -name "config.status" \ + -o -name "libtool" \ + \) -exec rm -rf {} \; || true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3210a00..3ba5478 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "4.13.0" %} +{% set version = "4.13.1" %} {% set name = "gap-split" %} package: @@ -7,7 +7,7 @@ package: source: url: https://github.com/gap-system/gap/releases/download/v{{ version }}/gap-{{ version }}.tar.gz - sha256: cc76ecbe33d6719450a593e613fb87e9e4247faa876f632dd0f97c398f92265d + sha256: 9794dbdba6fb998e0a2d0aa8ce21fc8848ad3d3f9cc9993b0b8e20be7e1dbeba patches: - 0001-Allow-cross-building-packages.patch - 0002-Do-not-run-prerequisites.sh.patch @@ -88,8 +88,8 @@ outputs: script: install-full.sh build: ignore_run_exports: - - python - - python_abi + - python * + - python_abi * requirements: build: - {{ compiler('cxx') }}