Merge pull request #405 from dbast/patch-1

Switch to constructor >=3.4.2
conda-forge · Jan 27, 2023 · 6ce67e8 · 6ce67e8
2 parents fa73327 + 51571b6
commit 6ce67e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml
@@ -1,4 +1,4 @@
-{% set version = os.environ.get("MINIFORGE_VERSION", "22.9.0-3") %}
+{% set version = os.environ.get("MINIFORGE_VERSION", "22.11.1-0") %}
 {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
 
 name: {{ name }}
@@ -32,4 +32,7 @@ specs:
   - conda {{ version.split("-")[0] }}
 
   - pip
+  # Unpin setuptools when the issue below is resolved
+  # https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/3973
+  - setuptools 65.*
   - miniforge_console_shortcut 1.*  # [win]
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -15,14 +15,10 @@ echo "***** Install constructor *****"
 conda install --yes \
     --channel conda-forge --override-channels \
     jinja2 curl libarchive \
-    "constructor>=3.3.1"
+    "constructor>=3.4.2"
 if [[ "$(uname)" == "Darwin" ]]; then
     conda install --yes coreutils --channel conda-forge --override-channels
 fi
-# shellcheck disable=SC2154
-if [[ "${TARGET_PLATFORM}" == win-* ]]; then
-    conda install --yes "nsis=3.01" --channel conda-forge --override-channels
-fi
 conda list
 
 echo "***** Make temp directory *****"