diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 6e15e52..506bba6 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -39,7 +39,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 92be900..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,22 +43,7 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup -( -# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm -# are drastically slowed down when the number of file descriptors is very high. -# This can be visible during a `yum install` step of a feedstock build. -# => Set a lower limit in a subshell for the `yum install`s only. -ulimit -n 1024 - -# Install the yum requirements defined canonically in the -# "recipe/yum_requirements.txt" file. After updating that file, -# run "conda smithy rerender" and this line will be updated -# automatically. -/usr/bin/sudo -n yum install -y mesa-libGL libselinux libXdamage libXxf86vm libXext - - - -)# make the build number clobber +# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c879..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b500a8f..fce086b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,7 +11,7 @@ source: build: skip: true # [ppc64le] - number: 0 + number: 1 run_exports: - {{ pin_subpackage(name, max_pin='x') }} @@ -26,8 +26,6 @@ requirements: - cmake - pkg-config - ninja - - {{ cdt('mesa-libgl-devel') }} # [linux] - - {{ cdt('mesa-dri-drivers') }} # [linux] - sed # [unix] - diffutils # [unix] - m2-sed # [win] @@ -48,6 +46,7 @@ requirements: - libosqp - osqp-eigen - assimp + - libgl-devel # [linux] - xorg-libx11 # [linux] - xorg-libxrandr # [linux] - xorg-libxfixes # [linux] diff --git a/recipe/yum_requirements.txt b/recipe/yum_requirements.txt deleted file mode 100644 index 4e003c7..0000000 --- a/recipe/yum_requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -mesa-libGL -libselinux -libXdamage -libXxf86vm -libXext