Skip to content

Commit 399b339

Browse files
davidrpughbetatim
authored andcommitted
[WIP] Version bump Conda from 4.6.14 to 4.7.5 (#719)
Version bump conda to 4.7.5 Co-authored-by: pughdr <[email protected]>
1 parent fbe3503 commit 399b339

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

repo2docker/buildpacks/conda/freeze.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# Docker image version can be different than conda version,
2323
# since miniconda3 docker images seem to lag conda releases.
2424
MINICONDA_DOCKER_VERSION = "4.5.12"
25-
CONDA_VERSION = "4.6.14"
25+
CONDA_VERSION = "4.7.5"
2626

2727
HERE = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
2828

repo2docker/buildpacks/conda/install-miniconda.bash

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -ex
44

55
cd $(dirname $0)
66
MINICONDA_VERSION=4.6.14
7-
CONDA_VERSION=4.6.14
7+
CONDA_VERSION=4.7.5
88
# Only MD5 checksums are available for miniconda
99
# Can be obtained from https://repo.continuum.io/miniconda/
1010
MD5SUM="718259965f234088d785cad1fbd7de03"
@@ -43,6 +43,9 @@ if [[ "${CONDA_VERSION}" != "${MINICONDA_VERSION}" ]]; then
4343
conda install -yq conda==${CONDA_VERSION}
4444
fi
4545

46+
# avoid future changes to default channel_priority behavior
47+
conda config --system --set channel_priority "flexible"
48+
4649
echo "installing notebook env:"
4750
cat /tmp/environment.yml
4851
conda env create -p ${NB_PYTHON_PREFIX} -f /tmp/environment.yml

tests/conda/binder-dir/verify

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ from subprocess import check_output
55
assert sys.version_info[:2] == (3, 5), sys.version
66

77
out = check_output(["conda", "--version"]).decode("utf8").strip()
8-
assert out == "conda 4.6.14", out
8+
assert out == "conda 4.7.5", out
99

1010
import numpy

0 commit comments

Comments
 (0)