Skip to content

Commit 19f499e

Browse files
authored
Merge pull request #263 from conda-forge/autoupdate-action
2 parents 40308a8 + a7f0e1a commit 19f499e

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Miniforge3/construct.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ specs:
2626
{% endif %}
2727

2828
{% if name.startswith("Mambaforge") %}
29-
- mamba 0.21.1
29+
- mamba 0.21.2
3030
{% endif %}
3131
- conda {{ version.split("-")[0] }}
3232

scripts/build.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ cd "${CONSTRUCT_ROOT}"
1212
# Constructor should be latest for non-native building
1313
# See https://github.com/conda/constructor
1414
echo "***** Install constructor *****"
15-
# pyyaml 6 broke constructor
16-
# https://github.com/conda/constructor/pull/473
17-
conda install -y "constructor>=3.1.0" "pyyaml<6" jinja2 curl libarchive -c conda-forge --override-channels
15+
conda install -y "constructor>=3.1.0" jinja2 curl libarchive -c conda-forge --override-channels
1816

1917

2018
if [[ "$(uname)" == "Darwin" ]]; then
@@ -24,7 +22,7 @@ fi
2422
if [[ "${TARGET_PLATFORM}" == win-* ]]; then
2523
conda install -y "nsis=3.01" -c conda-forge --override-channels
2624
fi
27-
pip install git+git://github.com/chrisburr/constructor@51415f3d62091daae7d21dab84add91d3cc73039#egg=constructor --force --no-deps
25+
pip install git+git://github.com/chrisburr/constructor@64ebd6d34f0f18684c76c0bebcfab41c38d55083#egg=constructor --force --no-deps
2826
conda list
2927

3028
echo "***** Make temp directory *****"
@@ -41,7 +39,7 @@ cp LICENSE "${TEMP_DIR}/"
4139
ls -al "${TEMP_DIR}"
4240

4341
if [[ "${TARGET_PLATFORM}" != win-* ]]; then
44-
MICROMAMBA_VERSION=0.21.0
42+
MICROMAMBA_VERSION=0.21.2
4543
mkdir "${TEMP_DIR}/micromamba"
4644
pushd "${TEMP_DIR}/micromamba"
4745
curl -L -O "https://anaconda.org/conda-forge/micromamba/${MICROMAMBA_VERSION}/download/${TARGET_PLATFORM}/micromamba-${MICROMAMBA_VERSION}-0.tar.bz2"
@@ -53,7 +51,6 @@ if [[ "${TARGET_PLATFORM}" != win-* ]]; then
5351
fi
5452
popd
5553
EXTRA_CONSTRUCTOR_ARGS="${EXTRA_CONSTRUCTOR_ARGS} --conda-exe ${MICROMAMBA_FILE} --platform ${TARGET_PLATFORM}"
56-
conda install -y libmambapy
5754
fi
5855

5956
echo "***** Construct the installer *****"

0 commit comments

Comments
 (0)