From 44b7148154c82e5213a59264fd226150e97f5fae Mon Sep 17 00:00:00 2001 From: A-Baji Date: Fri, 25 Mar 2022 15:29:58 -0500 Subject: [PATCH 01/35] python 3.10 image --- .github/workflows/development.yaml | 45 ++++++++++++++++++++++++++++-- config/.env | 11 ++++++-- dist/alpine/Dockerfile | 3 ++ dist/debian/Dockerfile | 3 ++ tests/main.sh | 6 +++- 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index f793e9e..9127596 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -8,6 +8,12 @@ jobs: strategy: matrix: include: + - distro: alpine + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + py_label: py39_ + conda_md5: 4e2f31e0b2598634c80daa12e4981647 - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -31,6 +37,11 @@ jobs: py_ver: 3.6 platform: linux/amd64 conda_md5: a946ea1d0c4a642ddf0c3a26a18bb16d + - distro: debian + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + py_label: py39_ - distro: debian conda_ver: 4.10.3 py_ver: 3.9 @@ -116,6 +127,11 @@ jobs: strategy: matrix: include: + - distro: alpine + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + package_manager: apk - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -136,6 +152,11 @@ jobs: py_ver: 3.6 platform: linux/amd64 package_manager: apk + - distro: debian + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + package_manager: apt - distro: debian conda_ver: 4.10.3 py_ver: 3.9 @@ -198,12 +219,22 @@ jobs: docker load < "${CONDA_VER}-py${PY_VER}-${DISTRO}-${PLATFORM_TAG}.tar.gz" tests/main.sh publish: - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: | + github.event_name == 'push' && + github.ref == 'refs/heads/master' && + ( + github.repository_owner == 'datajoint' || + github.repository_owner == 'vathes' + ) needs: test runs-on: ubuntu-latest strategy: matrix: include: + - distro: alpine + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -220,6 +251,10 @@ jobs: conda_ver: 4.5.4 py_ver: 3.6 platform: linux/amd64 + - distro: debian + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 - distro: debian conda_ver: 4.10.3 py_ver: 3.9 @@ -283,7 +318,13 @@ jobs: && docker push "${IMAGE}:latest" \ || echo "skipping 'latest' tag..." publish-docs: - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: | + github.event_name == 'push' && + github.ref == 'refs/heads/master' && + ( + github.repository_owner == 'datajoint' || + github.repository_owner == 'vathes' + ) runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/config/.env b/config/.env index c28b32e..e811c4b 100644 --- a/config/.env +++ b/config/.env @@ -1,9 +1,14 @@ ## build -CONDA_VER=4.10.3 -PY_VER=3.9 +CONDA_VER=4.12.0 +PY_VER=3.10 PY_LABEL=py39_ -CONDA_MD5=8c69f65a4ae27fb41df0fe552b4a8a3b +CONDA_MD5=4e2f31e0b2598634c80daa12e4981647 + +# CONDA_VER=4.10.3 +# PY_VER=3.9 +# PY_LABEL=py39_ +# CONDA_MD5=8c69f65a4ae27fb41df0fe552b4a8a3b # CONDA_VER=4.10.3 # PY_VER=3.8 diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile index 4db2682..422660d 100644 --- a/dist/alpine/Dockerfile +++ b/dist/alpine/Dockerfile @@ -82,6 +82,8 @@ RUN \ apk add /tmp/glibc-i18n-2.25-r0.apk && \ rm /tmp/glibc-i18n-2.25-r0.apk && \ /usr/glibc-compat/bin/localedef -i en_US -c -f UTF-8 en_US.UTF-8 && \ + # Remove after 4.12.0 version releases + [ "${CONDA_VER}" != "4.12.0" ] || CONDA_VER="4.11.0" && \ # Current latest Miniconda3 release wget --quiet $(echo "https://repo.anaconda.com/miniconda\ /Miniconda3-${PY_LABEL}${CONDA_VER}-Linux-x86_64.sh" | \ @@ -111,6 +113,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ + [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ diff --git a/dist/debian/Dockerfile b/dist/debian/Dockerfile index cf3e343..f8c0659 100644 --- a/dist/debian/Dockerfile +++ b/dist/debian/Dockerfile @@ -36,6 +36,8 @@ RUN \ # bzip2 ca-certificates libglib2.0-0 libxext6 libsm6 \ # libxrender1 git mercurial subversion && \ apt-get clean && \ + # Remove after 4.12.0 version releases + [ "${CONDA_VER}" != "4.12.0" ] || CONDA_VER="4.11.0" && \ wget --quiet $(echo "https://repo.anaconda.com/miniconda\ /Miniconda3-${PY_LABEL}${CONDA_VER}-Linux-$(uname -m).sh" | \ tr -d "\n" | tr -d "\t") -O ~/miniconda.sh && \ @@ -56,6 +58,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ + [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ diff --git a/tests/main.sh b/tests/main.sh index 6f56415..692384e 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -160,7 +160,9 @@ IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # Determine reference size -if [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then +if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then + SIZE_LIMIT=478 +elif [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=240 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=188 @@ -168,6 +170,8 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd6 SIZE_LIMIT=196 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=155 +elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then + SIZE_LIMIT=572 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=311 #481 elif [ $DISTRO == debian ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd64' ]; then From cdf6ce0cebef822b8bd5eeaa5f08acf9d8f32f6a Mon Sep 17 00:00:00 2001 From: A-Baji Date: Mon, 28 Mar 2022 10:55:20 -0500 Subject: [PATCH 02/35] bump size limit for testing workflow --- tests/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index 692384e..0619a55 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -161,7 +161,7 @@ SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # Determine reference size if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then - SIZE_LIMIT=478 + SIZE_LIMIT=4780 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=240 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd64' ]; then @@ -171,7 +171,7 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd6 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=155 elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then - SIZE_LIMIT=572 + SIZE_LIMIT=5720 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=311 #481 elif [ $DISTRO == debian ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd64' ]; then From 2dc5daa83e4db827462043bc7472373ed5c9a178 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 10:26:17 -0500 Subject: [PATCH 03/35] force github actions --- .github/workflows/development.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 9127596..c7be6b3 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -358,4 +358,4 @@ jobs: with: branch: gh-pages directory: gh-pages - github_token: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file + github_token: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file From 888a19b7adbc2cb9c1449d2fac31e7d8fad71c16 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 10:26:33 -0500 Subject: [PATCH 04/35] force github actiosn --- .github/workflows/development.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index c7be6b3..9127596 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -358,4 +358,4 @@ jobs: with: branch: gh-pages directory: gh-pages - github_token: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file + github_token: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file From f51f1c47039802046a0bd9d625ac5a4fc921d1dc Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 10:36:09 -0500 Subject: [PATCH 05/35] undo size bump --- tests/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index 0619a55..692384e 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -161,7 +161,7 @@ SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # Determine reference size if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then - SIZE_LIMIT=4780 + SIZE_LIMIT=478 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=240 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd64' ]; then @@ -171,7 +171,7 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd6 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=155 elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then - SIZE_LIMIT=5720 + SIZE_LIMIT=572 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=311 #481 elif [ $DISTRO == debian ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd64' ]; then From eedfb26d81d6db3e89a43e5b7289ade46ae17627 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 10:37:00 -0500 Subject: [PATCH 06/35] remove 0 from py_ver --- tests/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index 692384e..97d27fa 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -160,7 +160,7 @@ IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # Determine reference size -if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then +if [ $DISTRO == alpine ] && [ $PY_VER == '3.1' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=478 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=240 @@ -170,7 +170,7 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd6 SIZE_LIMIT=196 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=155 -elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then +elif [ $DISTRO == debian ] && [ $PY_VER == '3.1' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=572 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=311 #481 From ecde10f25a166d1616365dbf8bd62f27997ba935 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 10:42:44 -0500 Subject: [PATCH 07/35] conda ver hack --- tests/main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/main.sh b/tests/main.sh index 97d27fa..fd2a04c 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -22,6 +22,8 @@ assert () validate () { SHELL_CMD_FLAGS_ORIG=$SHELL_CMD_FLAGS # Verify proper versions + # Undo version downgrade in Dockerfile + [ "${CONDA_VER}" != "4.11.0" ] || CONDA_VER="4.12.0" && \ assert "conda version" "[ $($SHELL_CMD 'eval "$(cat)"' <<-END conda -V | awk '{print \$2}' END From 05afb080a71e3cf004539e8539fa2693177c689d Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 10:47:59 -0500 Subject: [PATCH 08/35] conda ver hack --- tests/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index fd2a04c..fc18ca4 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -22,8 +22,8 @@ assert () validate () { SHELL_CMD_FLAGS_ORIG=$SHELL_CMD_FLAGS # Verify proper versions - # Undo version downgrade in Dockerfile - [ "${CONDA_VER}" != "4.11.0" ] || CONDA_VER="4.12.0" && \ + # Remove once miniconda 4.12.0 releases + [ "${CONDA_VER}" != "4.12.0" ] || CONDA_VER="4.11.0" && \ assert "conda version" "[ $($SHELL_CMD 'eval "$(cat)"' <<-END conda -V | awk '{print \$2}' END From 9b6ae690c3502bfcfc9961c14dc107a17b252827 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 13:42:46 -0500 Subject: [PATCH 09/35] python ver hack --- tests/main.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index fc18ca4..366a816 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -22,12 +22,14 @@ assert () validate () { SHELL_CMD_FLAGS_ORIG=$SHELL_CMD_FLAGS # Verify proper versions - # Remove once miniconda 4.12.0 releases + # Bump down conda_ver for github actions to pass [ "${CONDA_VER}" != "4.12.0" ] || CONDA_VER="4.11.0" && \ assert "conda version" "[ $($SHELL_CMD 'eval "$(cat)"' <<-END conda -V | awk '{print \$2}' END ) == ${CONDA_VER} ]" $LINENO + # Bump down python_ver for gitbuh actions to pass + [ "${PY_VER}}" != "3.1" ] || PY_VER="3.9.7" && \ assert "python version" "grep -q .${PY_VER}. <<< .$($SHELL_CMD 'eval "$(cat)"' <<-END python --version 2>&1 | awk '{print \$2}' END @@ -162,7 +164,7 @@ IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # Determine reference size -if [ $DISTRO == alpine ] && [ $PY_VER == '3.1' ] && [ $PLATFORM == 'linux/amd64' ]; then +if [ $DISTRO == alpine ] && [ $PY_VER == '3.1' ] || [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=478 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=240 @@ -172,7 +174,7 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd6 SIZE_LIMIT=196 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=155 -elif [ $DISTRO == debian ] && [ $PY_VER == '3.1' ] && [ $PLATFORM == 'linux/amd64' ]; then +elif [ $DISTRO == debian ] && [ $PY_VER == '3.1' ] || [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=572 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=311 #481 From 8cb49c3ce48e6c5e1a95401f6406fb0f1144adbe Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 13:46:47 -0500 Subject: [PATCH 10/35] python ver hack --- tests/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/main.sh b/tests/main.sh index 366a816..41a460d 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -29,7 +29,7 @@ validate () { END ) == ${CONDA_VER} ]" $LINENO # Bump down python_ver for gitbuh actions to pass - [ "${PY_VER}}" != "3.1" ] || PY_VER="3.9.7" && \ + [ "${PY_VER}}" != "3.10" ] || PY_VER="3.9.7" && \ assert "python version" "grep -q .${PY_VER}. <<< .$($SHELL_CMD 'eval "$(cat)"' <<-END python --version 2>&1 | awk '{print \$2}' END From 1452f7c91c9cbb1c9603a7aebb6fc35de0f8c519 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 13:52:57 -0500 Subject: [PATCH 11/35] python ver hack --- tests/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/main.sh b/tests/main.sh index 41a460d..e3e46b8 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -29,7 +29,7 @@ validate () { END ) == ${CONDA_VER} ]" $LINENO # Bump down python_ver for gitbuh actions to pass - [ "${PY_VER}}" != "3.10" ] || PY_VER="3.9.7" && \ + [ "${PY_VER}" != "3.10" ] || PY_VER="3.9.7" && \ assert "python version" "grep -q .${PY_VER}. <<< .$($SHELL_CMD 'eval "$(cat)"' <<-END python --version 2>&1 | awk '{print \$2}' END From aee95d3dc336871dfce1d2bc5cb2bb3496bb6bfc Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 13:56:01 -0500 Subject: [PATCH 12/35] python ver hack --- tests/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/main.sh b/tests/main.sh index e3e46b8..5b8266f 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -29,7 +29,7 @@ validate () { END ) == ${CONDA_VER} ]" $LINENO # Bump down python_ver for gitbuh actions to pass - [ "${PY_VER}" != "3.10" ] || PY_VER="3.9.7" && \ + [ "${PY_VER}" != "3.1" ] || PY_VER="3.9.7" && \ assert "python version" "grep -q .${PY_VER}. <<< .$($SHELL_CMD 'eval "$(cat)"' <<-END python --version 2>&1 | awk '{print \$2}' END From 9a927244f06368722b5c3cddbf79cd83556ffc43 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 13:59:44 -0500 Subject: [PATCH 13/35] comment out 3.10 test --- .github/workflows/development.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 9127596..bd85c57 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -127,11 +127,11 @@ jobs: strategy: matrix: include: - - distro: alpine - conda_ver: 4.12.0 - py_ver: 3.10 - platform: linux/amd64 - package_manager: apk + # - distro: alpine + # conda_ver: 4.12.0 + # py_ver: 3.10 + # platform: linux/amd64 + # package_manager: apk - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -152,11 +152,11 @@ jobs: py_ver: 3.6 platform: linux/amd64 package_manager: apk - - distro: debian - conda_ver: 4.12.0 - py_ver: 3.10 - platform: linux/amd64 - package_manager: apt + # - distro: debian + # conda_ver: 4.12.0 + # py_ver: 3.10 + # platform: linux/amd64 + # package_manager: apt - distro: debian conda_ver: 4.10.3 py_ver: 3.9 From 8d5d60691888225a0c5b35bf921c18ca5919a0f6 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 14:19:21 -0500 Subject: [PATCH 14/35] py ver hack --- .github/workflows/development.yaml | 20 ++++++++++---------- tests/main.sh | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index bd85c57..9127596 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -127,11 +127,11 @@ jobs: strategy: matrix: include: - # - distro: alpine - # conda_ver: 4.12.0 - # py_ver: 3.10 - # platform: linux/amd64 - # package_manager: apk + - distro: alpine + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + package_manager: apk - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -152,11 +152,11 @@ jobs: py_ver: 3.6 platform: linux/amd64 package_manager: apk - # - distro: debian - # conda_ver: 4.12.0 - # py_ver: 3.10 - # platform: linux/amd64 - # package_manager: apt + - distro: debian + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + package_manager: apt - distro: debian conda_ver: 4.10.3 py_ver: 3.9 diff --git a/tests/main.sh b/tests/main.sh index 5b8266f..fa43920 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -29,7 +29,7 @@ validate () { END ) == ${CONDA_VER} ]" $LINENO # Bump down python_ver for gitbuh actions to pass - [ "${PY_VER}" != "3.1" ] || PY_VER="3.9.7" && \ + [ "${PY_VER}" != "3.1" ] || PY_VER="3.9" && \ assert "python version" "grep -q .${PY_VER}. <<< .$($SHELL_CMD 'eval "$(cat)"' <<-END python --version 2>&1 | awk '{print \$2}' END From 1da2c282482821f779bee17b5e784eead177742c Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 14:27:53 -0500 Subject: [PATCH 15/35] remove hacks modify update condition --- dist/alpine/Dockerfile | 2 +- dist/debian/Dockerfile | 2 +- tests/main.sh | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile index 422660d..40df81a 100644 --- a/dist/alpine/Dockerfile +++ b/dist/alpine/Dockerfile @@ -113,7 +113,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ + [ "${PY_VER}" != "3.10" ] || [ "${PY_VER}" != "3.1" ] conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ diff --git a/dist/debian/Dockerfile b/dist/debian/Dockerfile index f8c0659..b96066a 100644 --- a/dist/debian/Dockerfile +++ b/dist/debian/Dockerfile @@ -58,7 +58,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ + [ "${PY_VER}" != "3.10" ] || [ "${PY_VER}" != "3.1" ] conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ diff --git a/tests/main.sh b/tests/main.sh index fa43920..52dcf97 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -22,14 +22,10 @@ assert () validate () { SHELL_CMD_FLAGS_ORIG=$SHELL_CMD_FLAGS # Verify proper versions - # Bump down conda_ver for github actions to pass - [ "${CONDA_VER}" != "4.12.0" ] || CONDA_VER="4.11.0" && \ assert "conda version" "[ $($SHELL_CMD 'eval "$(cat)"' <<-END conda -V | awk '{print \$2}' END ) == ${CONDA_VER} ]" $LINENO - # Bump down python_ver for gitbuh actions to pass - [ "${PY_VER}" != "3.1" ] || PY_VER="3.9" && \ assert "python version" "grep -q .${PY_VER}. <<< .$($SHELL_CMD 'eval "$(cat)"' <<-END python --version 2>&1 | awk '{print \$2}' END From d36fe6c98936270d3ab9fc2d9f0dc7cbe2a0037c Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 14:35:02 -0500 Subject: [PATCH 16/35] fix update condition --- dist/alpine/Dockerfile | 2 +- dist/debian/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile index 40df81a..5986a8d 100644 --- a/dist/alpine/Dockerfile +++ b/dist/alpine/Dockerfile @@ -113,7 +113,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" ] || [ "${PY_VER}" != "3.1" ] conda install python=3.10 conda=4.12.0 && \ + [ "${PY_VER}" != "3.10" || "${PY_VER}" != "3.1" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ diff --git a/dist/debian/Dockerfile b/dist/debian/Dockerfile index b96066a..d0b77f7 100644 --- a/dist/debian/Dockerfile +++ b/dist/debian/Dockerfile @@ -58,7 +58,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" ] || [ "${PY_VER}" != "3.1" ] conda install python=3.10 conda=4.12.0 && \ + [ "${PY_VER}" != "3.10" || "${PY_VER}" != "3.1" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ From e4148ecd4efaeab2ba057727cbed6d9122421279 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 14:41:25 -0500 Subject: [PATCH 17/35] check 3.10 only --- .github/workflows/development.yaml | 164 ++++++++++++++--------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 9127596..1b4cc89 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -14,53 +14,53 @@ jobs: platform: linux/amd64 py_label: py39_ conda_md5: 4e2f31e0b2598634c80daa12e4981647 - - distro: alpine - conda_ver: 4.10.3 - py_ver: 3.9 - platform: linux/amd64 - py_label: py39_ - conda_md5: 8c69f65a4ae27fb41df0fe552b4a8a3b - - distro: alpine - conda_ver: 4.10.3 - py_ver: 3.8 - platform: linux/amd64 - py_label: py38_ - conda_md5: 14da4a9a44b337f7ccb8363537f65b9c - - distro: alpine - conda_ver: 4.10.3 - py_ver: 3.7 - platform: linux/amd64 - py_label: py37_ - conda_md5: 9f186c1d86c266acc47dbc1603f0e2ed - - distro: alpine - conda_ver: 4.5.4 - py_ver: 3.6 - platform: linux/amd64 - conda_md5: a946ea1d0c4a642ddf0c3a26a18bb16d + # - distro: alpine + # conda_ver: 4.10.3 + # py_ver: 3.9 + # platform: linux/amd64 + # py_label: py39_ + # conda_md5: 8c69f65a4ae27fb41df0fe552b4a8a3b + # - distro: alpine + # conda_ver: 4.10.3 + # py_ver: 3.8 + # platform: linux/amd64 + # py_label: py38_ + # conda_md5: 14da4a9a44b337f7ccb8363537f65b9c + # - distro: alpine + # conda_ver: 4.10.3 + # py_ver: 3.7 + # platform: linux/amd64 + # py_label: py37_ + # conda_md5: 9f186c1d86c266acc47dbc1603f0e2ed + # - distro: alpine + # conda_ver: 4.5.4 + # py_ver: 3.6 + # platform: linux/amd64 + # conda_md5: a946ea1d0c4a642ddf0c3a26a18bb16d - distro: debian conda_ver: 4.12.0 py_ver: 3.10 platform: linux/amd64 py_label: py39_ - - distro: debian - conda_ver: 4.10.3 - py_ver: 3.9 - platform: linux/amd64 - py_label: py39_ - - distro: debian - conda_ver: 4.10.3 - py_ver: 3.8 - platform: linux/amd64 - py_label: py38_ - - distro: debian - conda_ver: 4.10.3 - py_ver: 3.7 - platform: linux/amd64 - py_label: py37_ - - distro: debian - conda_ver: 4.5.4 - py_ver: 3.6 - platform: linux/amd64 + # - distro: debian + # conda_ver: 4.10.3 + # py_ver: 3.9 + # platform: linux/amd64 + # py_label: py39_ + # - distro: debian + # conda_ver: 4.10.3 + # py_ver: 3.8 + # platform: linux/amd64 + # py_label: py38_ + # - distro: debian + # conda_ver: 4.10.3 + # py_ver: 3.7 + # platform: linux/amd64 + # py_label: py37_ + # - distro: debian + # conda_ver: 4.5.4 + # py_ver: 3.6 + # platform: linux/amd64 # - distro: debian # conda_ver: 4.10.3 # py_ver: 3.9 @@ -132,51 +132,51 @@ jobs: py_ver: 3.10 platform: linux/amd64 package_manager: apk - - distro: alpine - conda_ver: 4.10.3 - py_ver: 3.9 - platform: linux/amd64 - package_manager: apk - - distro: alpine - conda_ver: 4.10.3 - py_ver: 3.8 - platform: linux/amd64 - package_manager: apk - - distro: alpine - conda_ver: 4.10.3 - py_ver: 3.7 - platform: linux/amd64 - package_manager: apk - - distro: alpine - conda_ver: 4.5.4 - py_ver: 3.6 - platform: linux/amd64 - package_manager: apk + # - distro: alpine + # conda_ver: 4.10.3 + # py_ver: 3.9 + # platform: linux/amd64 + # package_manager: apk + # - distro: alpine + # conda_ver: 4.10.3 + # py_ver: 3.8 + # platform: linux/amd64 + # package_manager: apk + # - distro: alpine + # conda_ver: 4.10.3 + # py_ver: 3.7 + # platform: linux/amd64 + # package_manager: apk + # - distro: alpine + # conda_ver: 4.5.4 + # py_ver: 3.6 + # platform: linux/amd64 + # package_manager: apk - distro: debian conda_ver: 4.12.0 py_ver: 3.10 platform: linux/amd64 package_manager: apt - - distro: debian - conda_ver: 4.10.3 - py_ver: 3.9 - platform: linux/amd64 - package_manager: apt - - distro: debian - conda_ver: 4.10.3 - py_ver: 3.8 - platform: linux/amd64 - package_manager: apt - - distro: debian - conda_ver: 4.10.3 - py_ver: 3.7 - platform: linux/amd64 - package_manager: apt - - distro: debian - conda_ver: 4.5.4 - py_ver: 3.6 - platform: linux/amd64 - package_manager: apt + # - distro: debian + # conda_ver: 4.10.3 + # py_ver: 3.9 + # platform: linux/amd64 + # package_manager: apt + # - distro: debian + # conda_ver: 4.10.3 + # py_ver: 3.8 + # platform: linux/amd64 + # package_manager: apt + # - distro: debian + # conda_ver: 4.10.3 + # py_ver: 3.7 + # platform: linux/amd64 + # package_manager: apt + # - distro: debian + # conda_ver: 4.5.4 + # py_ver: 3.6 + # platform: linux/amd64 + # package_manager: apt # - distro: debian # conda_ver: 4.10.3 # py_ver: 3.9 From 29edd2b1e6e231d3073938282244cbbdc59a0f6b Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 14:53:21 -0500 Subject: [PATCH 18/35] py ver hack --- tests/main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/main.sh b/tests/main.sh index 52dcf97..87ea39c 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -98,6 +98,8 @@ validate () { TEST_MODULE=beautifulsoup4 TEST_MODULE_IMPORT=bs4 + # Python 3.10 version hack + [ "${PY_VER}" != "3.1" ] || "PY_VER" != "3.10" && \ assert "pip install" "grep -q /opt/conda/lib/python${PY_VER}/site-packages/ <<< \ $($SHELL_CMD 'eval "$(cat)"' <<-END | tail -1 pip install --force-reinstall $TEST_MODULE && \ From 98ea62f444d3605756c74a51630c206b254e6f72 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 15:52:23 -0500 Subject: [PATCH 19/35] fix py ver hack --- tests/main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/main.sh b/tests/main.sh index 87ea39c..7765ddd 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -99,7 +99,7 @@ validate () { TEST_MODULE_IMPORT=bs4 # Python 3.10 version hack - [ "${PY_VER}" != "3.1" ] || "PY_VER" != "3.10" && \ + [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ assert "pip install" "grep -q /opt/conda/lib/python${PY_VER}/site-packages/ <<< \ $($SHELL_CMD 'eval "$(cat)"' <<-END | tail -1 pip install --force-reinstall $TEST_MODULE && \ From af235346dd7b031bf3e4be8a3a56fdc479dd3019 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 16:00:50 -0500 Subject: [PATCH 20/35] uncomment other versions --- .github/workflows/development.yaml | 84 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 1b4cc89..04dff4f 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -14,53 +14,53 @@ jobs: platform: linux/amd64 py_label: py39_ conda_md5: 4e2f31e0b2598634c80daa12e4981647 - # - distro: alpine - # conda_ver: 4.10.3 - # py_ver: 3.9 - # platform: linux/amd64 - # py_label: py39_ - # conda_md5: 8c69f65a4ae27fb41df0fe552b4a8a3b - # - distro: alpine - # conda_ver: 4.10.3 - # py_ver: 3.8 - # platform: linux/amd64 - # py_label: py38_ - # conda_md5: 14da4a9a44b337f7ccb8363537f65b9c - # - distro: alpine - # conda_ver: 4.10.3 - # py_ver: 3.7 - # platform: linux/amd64 - # py_label: py37_ - # conda_md5: 9f186c1d86c266acc47dbc1603f0e2ed - # - distro: alpine - # conda_ver: 4.5.4 - # py_ver: 3.6 - # platform: linux/amd64 - # conda_md5: a946ea1d0c4a642ddf0c3a26a18bb16d + - distro: alpine + conda_ver: 4.10.3 + py_ver: 3.9 + platform: linux/amd64 + py_label: py39_ + conda_md5: 8c69f65a4ae27fb41df0fe552b4a8a3b + - distro: alpine + conda_ver: 4.10.3 + py_ver: 3.8 + platform: linux/amd64 + py_label: py38_ + conda_md5: 14da4a9a44b337f7ccb8363537f65b9c + - distro: alpine + conda_ver: 4.10.3 + py_ver: 3.7 + platform: linux/amd64 + py_label: py37_ + conda_md5: 9f186c1d86c266acc47dbc1603f0e2ed + - distro: alpine + conda_ver: 4.5.4 + py_ver: 3.6 + platform: linux/amd64 + conda_md5: a946ea1d0c4a642ddf0c3a26a18bb16d - distro: debian conda_ver: 4.12.0 py_ver: 3.10 platform: linux/amd64 py_label: py39_ - # - distro: debian - # conda_ver: 4.10.3 - # py_ver: 3.9 - # platform: linux/amd64 - # py_label: py39_ - # - distro: debian - # conda_ver: 4.10.3 - # py_ver: 3.8 - # platform: linux/amd64 - # py_label: py38_ - # - distro: debian - # conda_ver: 4.10.3 - # py_ver: 3.7 - # platform: linux/amd64 - # py_label: py37_ - # - distro: debian - # conda_ver: 4.5.4 - # py_ver: 3.6 - # platform: linux/amd64 + - distro: debian + conda_ver: 4.10.3 + py_ver: 3.9 + platform: linux/amd64 + py_label: py39_ + - distro: debian + conda_ver: 4.10.3 + py_ver: 3.8 + platform: linux/amd64 + py_label: py38_ + - distro: debian + conda_ver: 4.10.3 + py_ver: 3.7 + platform: linux/amd64 + py_label: py37_ + - distro: debian + conda_ver: 4.5.4 + py_ver: 3.6 + platform: linux/amd64 # - distro: debian # conda_ver: 4.10.3 # py_ver: 3.9 From 3bb437d1bd690b1122cb0c905e241998541e2be9 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 16:07:35 -0500 Subject: [PATCH 21/35] uncomment other verison tests --- .github/workflows/development.yaml | 80 +++++++++++++++--------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 04dff4f..9127596 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -132,51 +132,51 @@ jobs: py_ver: 3.10 platform: linux/amd64 package_manager: apk - # - distro: alpine - # conda_ver: 4.10.3 - # py_ver: 3.9 - # platform: linux/amd64 - # package_manager: apk - # - distro: alpine - # conda_ver: 4.10.3 - # py_ver: 3.8 - # platform: linux/amd64 - # package_manager: apk - # - distro: alpine - # conda_ver: 4.10.3 - # py_ver: 3.7 - # platform: linux/amd64 - # package_manager: apk - # - distro: alpine - # conda_ver: 4.5.4 - # py_ver: 3.6 - # platform: linux/amd64 - # package_manager: apk + - distro: alpine + conda_ver: 4.10.3 + py_ver: 3.9 + platform: linux/amd64 + package_manager: apk + - distro: alpine + conda_ver: 4.10.3 + py_ver: 3.8 + platform: linux/amd64 + package_manager: apk + - distro: alpine + conda_ver: 4.10.3 + py_ver: 3.7 + platform: linux/amd64 + package_manager: apk + - distro: alpine + conda_ver: 4.5.4 + py_ver: 3.6 + platform: linux/amd64 + package_manager: apk - distro: debian conda_ver: 4.12.0 py_ver: 3.10 platform: linux/amd64 package_manager: apt - # - distro: debian - # conda_ver: 4.10.3 - # py_ver: 3.9 - # platform: linux/amd64 - # package_manager: apt - # - distro: debian - # conda_ver: 4.10.3 - # py_ver: 3.8 - # platform: linux/amd64 - # package_manager: apt - # - distro: debian - # conda_ver: 4.10.3 - # py_ver: 3.7 - # platform: linux/amd64 - # package_manager: apt - # - distro: debian - # conda_ver: 4.5.4 - # py_ver: 3.6 - # platform: linux/amd64 - # package_manager: apt + - distro: debian + conda_ver: 4.10.3 + py_ver: 3.9 + platform: linux/amd64 + package_manager: apt + - distro: debian + conda_ver: 4.10.3 + py_ver: 3.8 + platform: linux/amd64 + package_manager: apt + - distro: debian + conda_ver: 4.10.3 + py_ver: 3.7 + platform: linux/amd64 + package_manager: apt + - distro: debian + conda_ver: 4.5.4 + py_ver: 3.6 + platform: linux/amd64 + package_manager: apt # - distro: debian # conda_ver: 4.10.3 # py_ver: 3.9 From 328505e293bb06b4a7eb128ea1ccfed30ee99e46 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 16:18:22 -0500 Subject: [PATCH 22/35] py ver hack --- tests/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index 7765ddd..9612275 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -162,7 +162,7 @@ IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # Determine reference size -if [ $DISTRO == alpine ] && [ $PY_VER == '3.1' ] || [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then +if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=478 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=240 @@ -172,7 +172,7 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd6 SIZE_LIMIT=196 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=155 -elif [ $DISTRO == debian ] && [ $PY_VER == '3.1' ] || [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then +elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=572 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=311 #481 From b0c6369130e67a43e9863f23129f7d58f51544a3 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 16:36:29 -0500 Subject: [PATCH 23/35] move py ver hack --- dist/alpine/Dockerfile | 4 +++- dist/debian/Dockerfile | 4 +++- tests/main.sh | 2 -- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile index 5986a8d..2ab6a0e 100644 --- a/dist/alpine/Dockerfile +++ b/dist/alpine/Dockerfile @@ -113,7 +113,9 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" || "${PY_VER}" != "3.1" ] || conda install python=3.10 conda=4.12.0 && \ + # Python 3.10 version hack + [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ + [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ diff --git a/dist/debian/Dockerfile b/dist/debian/Dockerfile index d0b77f7..2dccbb7 100644 --- a/dist/debian/Dockerfile +++ b/dist/debian/Dockerfile @@ -58,7 +58,9 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" || "${PY_VER}" != "3.1" ] || conda install python=3.10 conda=4.12.0 && \ + # Python 3.10 version hack + [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ + [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ diff --git a/tests/main.sh b/tests/main.sh index 9612275..692384e 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -98,8 +98,6 @@ validate () { TEST_MODULE=beautifulsoup4 TEST_MODULE_IMPORT=bs4 - # Python 3.10 version hack - [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ assert "pip install" "grep -q /opt/conda/lib/python${PY_VER}/site-packages/ <<< \ $($SHELL_CMD 'eval "$(cat)"' <<-END | tail -1 pip install --force-reinstall $TEST_MODULE && \ From 33a02bcc16938d71b3592d17226e66b173295195 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 16:50:32 -0500 Subject: [PATCH 24/35] py ver hack --- tests/main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/main.sh b/tests/main.sh index 692384e..9612275 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -98,6 +98,8 @@ validate () { TEST_MODULE=beautifulsoup4 TEST_MODULE_IMPORT=bs4 + # Python 3.10 version hack + [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ assert "pip install" "grep -q /opt/conda/lib/python${PY_VER}/site-packages/ <<< \ $($SHELL_CMD 'eval "$(cat)"' <<-END | tail -1 pip install --force-reinstall $TEST_MODULE && \ From 680aa098cf5bda7c8b3264a6240d2d98e5c30bef Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 17:09:44 -0500 Subject: [PATCH 25/35] final py ver hack?? --- tests/main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index 9612275..fae73d5 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -162,7 +162,7 @@ IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # Determine reference size -if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then +if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] || [ $PY_VER == '3.1' ]&& [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=478 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=240 @@ -172,7 +172,7 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd6 SIZE_LIMIT=196 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=155 -elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then +elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] || [ $PY_VER == '3.1' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=572 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=311 #481 From b2e9b66827cd62785f3524813fbcd91bfe4023b6 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 18:39:44 -0500 Subject: [PATCH 26/35] final py ver hack for real --- tests/main.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index fae73d5..fbf02ac 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -19,6 +19,9 @@ assert () tr -d '\t' fi } + +# Python 3.10 version hack +[ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ validate () { SHELL_CMD_FLAGS_ORIG=$SHELL_CMD_FLAGS # Verify proper versions @@ -98,8 +101,6 @@ validate () { TEST_MODULE=beautifulsoup4 TEST_MODULE_IMPORT=bs4 - # Python 3.10 version hack - [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ assert "pip install" "grep -q /opt/conda/lib/python${PY_VER}/site-packages/ <<< \ $($SHELL_CMD 'eval "$(cat)"' <<-END | tail -1 pip install --force-reinstall $TEST_MODULE && \ @@ -162,7 +163,7 @@ IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" # Determine reference size -if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] || [ $PY_VER == '3.1' ]&& [ $PLATFORM == 'linux/amd64' ]; then +if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=478 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=240 @@ -172,7 +173,7 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd6 SIZE_LIMIT=196 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=155 -elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] || [ $PY_VER == '3.1' ] && [ $PLATFORM == 'linux/amd64' ]; then +elif [ $DISTRO == debian ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=572 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=311 #481 From 54d1945774c51071dd60285726dc4fe6b6abd373 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 18:52:13 -0500 Subject: [PATCH 27/35] comment out 3.10 --- .github/workflows/development.yaml | 42 +++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 9127596..1c5d746 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -8,12 +8,12 @@ jobs: strategy: matrix: include: - - distro: alpine - conda_ver: 4.12.0 - py_ver: 3.10 - platform: linux/amd64 - py_label: py39_ - conda_md5: 4e2f31e0b2598634c80daa12e4981647 + # - distro: alpine + # conda_ver: 4.12.0 + # py_ver: 3.10 + # platform: linux/amd64 + # py_label: py39_ + # conda_md5: 4e2f31e0b2598634c80daa12e4981647 - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -37,11 +37,11 @@ jobs: py_ver: 3.6 platform: linux/amd64 conda_md5: a946ea1d0c4a642ddf0c3a26a18bb16d - - distro: debian - conda_ver: 4.12.0 - py_ver: 3.10 - platform: linux/amd64 - py_label: py39_ + # - distro: debian + # conda_ver: 4.12.0 + # py_ver: 3.10 + # platform: linux/amd64 + # py_label: py39_ - distro: debian conda_ver: 4.10.3 py_ver: 3.9 @@ -127,11 +127,11 @@ jobs: strategy: matrix: include: - - distro: alpine - conda_ver: 4.12.0 - py_ver: 3.10 - platform: linux/amd64 - package_manager: apk + # - distro: alpine + # conda_ver: 4.12.0 + # py_ver: 3.10 + # platform: linux/amd64 + # package_manager: apk - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -152,11 +152,11 @@ jobs: py_ver: 3.6 platform: linux/amd64 package_manager: apk - - distro: debian - conda_ver: 4.12.0 - py_ver: 3.10 - platform: linux/amd64 - package_manager: apt + # - distro: debian + # conda_ver: 4.12.0 + # py_ver: 3.10 + # platform: linux/amd64 + # package_manager: apt - distro: debian conda_ver: 4.10.3 py_ver: 3.9 From 87fee762fdcb82154ec5feb0704c3e5e79b31605 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Tue, 29 Mar 2022 19:07:48 -0500 Subject: [PATCH 28/35] fix py ver --- .github/workflows/development.yaml | 42 +++++++++++++++--------------- tests/main.sh | 7 ++--- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 1c5d746..9127596 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -8,12 +8,12 @@ jobs: strategy: matrix: include: - # - distro: alpine - # conda_ver: 4.12.0 - # py_ver: 3.10 - # platform: linux/amd64 - # py_label: py39_ - # conda_md5: 4e2f31e0b2598634c80daa12e4981647 + - distro: alpine + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + py_label: py39_ + conda_md5: 4e2f31e0b2598634c80daa12e4981647 - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -37,11 +37,11 @@ jobs: py_ver: 3.6 platform: linux/amd64 conda_md5: a946ea1d0c4a642ddf0c3a26a18bb16d - # - distro: debian - # conda_ver: 4.12.0 - # py_ver: 3.10 - # platform: linux/amd64 - # py_label: py39_ + - distro: debian + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + py_label: py39_ - distro: debian conda_ver: 4.10.3 py_ver: 3.9 @@ -127,11 +127,11 @@ jobs: strategy: matrix: include: - # - distro: alpine - # conda_ver: 4.12.0 - # py_ver: 3.10 - # platform: linux/amd64 - # package_manager: apk + - distro: alpine + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + package_manager: apk - distro: alpine conda_ver: 4.10.3 py_ver: 3.9 @@ -152,11 +152,11 @@ jobs: py_ver: 3.6 platform: linux/amd64 package_manager: apk - # - distro: debian - # conda_ver: 4.12.0 - # py_ver: 3.10 - # platform: linux/amd64 - # package_manager: apt + - distro: debian + conda_ver: 4.12.0 + py_ver: 3.10 + platform: linux/amd64 + package_manager: apt - distro: debian conda_ver: 4.10.3 py_ver: 3.9 diff --git a/tests/main.sh b/tests/main.sh index fbf02ac..f750b62 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -19,9 +19,6 @@ assert () tr -d '\t' fi } - -# Python 3.10 version hack -[ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ validate () { SHELL_CMD_FLAGS_ORIG=$SHELL_CMD_FLAGS # Verify proper versions @@ -101,6 +98,8 @@ validate () { TEST_MODULE=beautifulsoup4 TEST_MODULE_IMPORT=bs4 + # Python 3.10 version hack + [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ assert "pip install" "grep -q /opt/conda/lib/python${PY_VER}/site-packages/ <<< \ $($SHELL_CMD 'eval "$(cat)"' <<-END | tail -1 pip install --force-reinstall $TEST_MODULE && \ @@ -162,6 +161,8 @@ TAG=$(echo $REF | awk -F':' '{print $2}') IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" +# Python 3.10 version hack +[ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ # Determine reference size if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=478 From 23db81eef569f8ca29261824334b7fae9ea7573c Mon Sep 17 00:00:00 2001 From: A-Baji Date: Wed, 30 Mar 2022 10:14:41 -0500 Subject: [PATCH 29/35] fix repo owner name --- .github/workflows/development.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 9127596..06d7bff 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -224,7 +224,7 @@ jobs: github.ref == 'refs/heads/master' && ( github.repository_owner == 'datajoint' || - github.repository_owner == 'vathes' + github.repository_owner == 'datajoint-company' ) needs: test runs-on: ubuntu-latest @@ -323,7 +323,7 @@ jobs: github.ref == 'refs/heads/master' && ( github.repository_owner == 'datajoint' || - github.repository_owner == 'vathes' + github.repository_owner == 'datajoint-company' ) runs-on: ubuntu-latest steps: From 5167240cc323505e6037cb08f932bda3d830c361 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Wed, 30 Mar 2022 11:08:27 -0500 Subject: [PATCH 30/35] py ver hack test --- tests/main.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/main.sh b/tests/main.sh index f750b62..83f4bdb 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -98,8 +98,6 @@ validate () { TEST_MODULE=beautifulsoup4 TEST_MODULE_IMPORT=bs4 - # Python 3.10 version hack - [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ assert "pip install" "grep -q /opt/conda/lib/python${PY_VER}/site-packages/ <<< \ $($SHELL_CMD 'eval "$(cat)"' <<-END | tail -1 pip install --force-reinstall $TEST_MODULE && \ From 26dc54facf5e4b943a661ed1b86e7cdde8f4e4fa Mon Sep 17 00:00:00 2001 From: A-Baji Date: Wed, 30 Mar 2022 11:28:34 -0500 Subject: [PATCH 31/35] wrap 3.10 in quotes remove py ver hack --- .github/workflows/development.yaml | 12 ++++++------ config/.env | 2 +- dist/alpine/Dockerfile | 2 -- dist/debian/Dockerfile | 2 -- tests/main.sh | 2 -- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 06d7bff..78b1e74 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -10,7 +10,7 @@ jobs: include: - distro: alpine conda_ver: 4.12.0 - py_ver: 3.10 + py_ver: '3.10' platform: linux/amd64 py_label: py39_ conda_md5: 4e2f31e0b2598634c80daa12e4981647 @@ -39,7 +39,7 @@ jobs: conda_md5: a946ea1d0c4a642ddf0c3a26a18bb16d - distro: debian conda_ver: 4.12.0 - py_ver: 3.10 + py_ver: '3.10' platform: linux/amd64 py_label: py39_ - distro: debian @@ -129,7 +129,7 @@ jobs: include: - distro: alpine conda_ver: 4.12.0 - py_ver: 3.10 + py_ver: '3.10' platform: linux/amd64 package_manager: apk - distro: alpine @@ -154,7 +154,7 @@ jobs: package_manager: apk - distro: debian conda_ver: 4.12.0 - py_ver: 3.10 + py_ver: '3.10' platform: linux/amd64 package_manager: apt - distro: debian @@ -233,7 +233,7 @@ jobs: include: - distro: alpine conda_ver: 4.12.0 - py_ver: 3.10 + py_ver: '3.10' platform: linux/amd64 - distro: alpine conda_ver: 4.10.3 @@ -253,7 +253,7 @@ jobs: platform: linux/amd64 - distro: debian conda_ver: 4.12.0 - py_ver: 3.10 + py_ver: '3.10' platform: linux/amd64 - distro: debian conda_ver: 4.10.3 diff --git a/config/.env b/config/.env index e811c4b..f663b9d 100644 --- a/config/.env +++ b/config/.env @@ -1,7 +1,7 @@ ## build CONDA_VER=4.12.0 -PY_VER=3.10 +PY_VER='3.10' PY_LABEL=py39_ CONDA_MD5=4e2f31e0b2598634c80daa12e4981647 diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile index 2ab6a0e..422660d 100644 --- a/dist/alpine/Dockerfile +++ b/dist/alpine/Dockerfile @@ -113,8 +113,6 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - # Python 3.10 version hack - [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ diff --git a/dist/debian/Dockerfile b/dist/debian/Dockerfile index 2dccbb7..f8c0659 100644 --- a/dist/debian/Dockerfile +++ b/dist/debian/Dockerfile @@ -58,8 +58,6 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - # Python 3.10 version hack - [ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ diff --git a/tests/main.sh b/tests/main.sh index 83f4bdb..692384e 100755 --- a/tests/main.sh +++ b/tests/main.sh @@ -159,8 +159,6 @@ TAG=$(echo $REF | awk -F':' '{print $2}') IMAGE=$(echo $REF | awk -F':' '{print $1}') SHELL_CMD_TEMPLATE="docker run --rm -i \$SHELL_CMD_FLAGS $REF \ $(docker inspect "$REF" --format '{{join .Config.Cmd " "}}') -c" -# Python 3.10 version hack -[ "${PY_VER}" != "3.1" ] || PY_VER="3.10" && \ # Determine reference size if [ $DISTRO == alpine ] && [ $PY_VER == '3.10' ] && [ $PLATFORM == 'linux/amd64' ]; then SIZE_LIMIT=478 From 2338a145b8bceabd061b3cf6f8790d98edd05484 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Wed, 30 Mar 2022 11:40:10 -0500 Subject: [PATCH 32/35] wrap python install ver in quotes --- dist/alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile index 422660d..9fc43a8 100644 --- a/dist/alpine/Dockerfile +++ b/dist/alpine/Dockerfile @@ -113,7 +113,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ + [ "${PY_VER}" != "3.10" ] || conda install python='3.10' conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ From f9e57346a9e3b37e12667ccd39fefcbaf0f9bb92 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Wed, 30 Mar 2022 11:48:11 -0500 Subject: [PATCH 33/35] remove install ver quotes --- dist/alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile index 9fc43a8..422660d 100644 --- a/dist/alpine/Dockerfile +++ b/dist/alpine/Dockerfile @@ -113,7 +113,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" ] || conda install python='3.10' conda=4.12.0 && \ + [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ From 454da905eb95a35334fe1dec34d5b8dc9b39d1f4 Mon Sep 17 00:00:00 2001 From: A-Baji Date: Wed, 30 Mar 2022 14:42:19 -0500 Subject: [PATCH 34/35] default 3.9 in .env --- config/.env | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/.env b/config/.env index f663b9d..e7a34d3 100644 --- a/config/.env +++ b/config/.env @@ -1,14 +1,14 @@ ## build -CONDA_VER=4.12.0 -PY_VER='3.10' -PY_LABEL=py39_ -CONDA_MD5=4e2f31e0b2598634c80daa12e4981647 - -# CONDA_VER=4.10.3 -# PY_VER=3.9 +# CONDA_VER=4.12.0 +# PY_VER='3.10' # PY_LABEL=py39_ -# CONDA_MD5=8c69f65a4ae27fb41df0fe552b4a8a3b +# CONDA_MD5=4e2f31e0b2598634c80daa12e4981647 + +CONDA_VER=4.10.3 +PY_VER=3.9 +PY_LABEL=py39_ +CONDA_MD5=8c69f65a4ae27fb41df0fe552b4a8a3b # CONDA_VER=4.10.3 # PY_VER=3.8 From 0eff3cac81e257ed285ddd2a33c6763d09b6e2bc Mon Sep 17 00:00:00 2001 From: A-Baji Date: Wed, 30 Mar 2022 14:53:27 -0500 Subject: [PATCH 35/35] use env var for version upgrade --- dist/alpine/Dockerfile | 2 +- dist/debian/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile index 422660d..c188832 100644 --- a/dist/alpine/Dockerfile +++ b/dist/alpine/Dockerfile @@ -113,7 +113,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ + [ "${PY_VER}" != "3.10" ] || conda install python=${PY_VER} conda=${CONDA_VER} && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\ diff --git a/dist/debian/Dockerfile b/dist/debian/Dockerfile index f8c0659..b761446 100644 --- a/dist/debian/Dockerfile +++ b/dist/debian/Dockerfile @@ -58,7 +58,7 @@ RUN \ umask u+rwx,g+rwx,o-rwx && \ conda config --add channels conda-forge && \ conda config --set auto_update_conda False && \ - [ "${PY_VER}" != "3.10" ] || conda install python=3.10 conda=4.12.0 && \ + [ "${PY_VER}" != "3.10" ] || conda install python=${PY_VER} conda=${CONDA_VER} && \ [ "${PY_VER}" != "3.6" ] || sed -i \ $(echo "s@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>)(?!\[=<>!\])\ (\S\+)$')@version_relation_re = re.compile(r'(==|!=|<=|>=|<|>|=)\