hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-10 11:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump Miniforge patch number to the latest released

Browse Source 
Fix the CondaPackageHelper to handle cases when conda spec is expressed with two `=` signs instead of a single one.
This commit is contained in:
romainx
2020-11-25 21:35:05 +01:00
parent 1d2581b4f8
commit 5f140e6972
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
base-notebook/Dockerfile
View File

@@ -26,7 +26,7 @@ USER root
# Conda version # Conda version
ARG conda_version="4.9.0" ARG conda_version="4.9.0"
# Miniforge installer patch version # Miniforge installer patch version
ARG miniforge_patch_number="3" ARG miniforge_patch_number="4"
# Miniforge installer architecture # Miniforge installer architecture
ARG miniforge_arch="x86_64" ARG miniforge_arch="x86_64"
# Python implementation to use # Python implementation to use
@@ -38,7 +38,7 @@ ARG miniforge_version="${conda_version}-${miniforge_patch_number}"
# Miniforge installer # Miniforge installer
ARG miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${miniforge_arch}.sh" ARG miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${miniforge_arch}.sh"
# Miniforge checksum # Miniforge checksum
ARG miniforge_checksum="29f0eb17dd02aceb0dfd4dad2654e974b1699baed06ee6d350b0ab4a2ccf3d02" ARG miniforge_checksum="dae28a05f0fcfed0b47c66468e8434ab42cb1ff90de96540a506949cdecd2b5a"
# Install all OS dependencies for notebook server that starts but lacks all # Install all OS dependencies for notebook server that starts but lacks all
# features (e.g., download as all possible file formats) # features (e.g., download as all possible file formats)

4
test/helpers.py
View File

@@ -93,11 +93,11 @@ class CondaPackageHelper:
# Since we only manage packages installed through conda here # Since we only manage packages installed through conda here
dependencies = filter(lambda x: isinstance(x, str), dependencies) dependencies = filter(lambda x: isinstance(x, str), dependencies)
packages_dict = dict() packages_dict = dict()
for split in map(lambda x: x.split("=", 1), dependencies): for split in map(lambda x: re.split("=?=", x), dependencies):
# default values # default values
package = split[0] package = split[0]
version = set() version = set()
# cheking if it's a proper version by testing if the first char is a digit # checking if it's a proper version by testing if the first char is a digit
if len(split) > 1: if len(split) > 1:
if split[1][0].isdigit(): if split[1][0].isdigit():
# package + version case # package + version case