Merge pull request #44 from A-Baji/add-3.10

remove py 3.6 support
datajoint · Apr 1, 2022 · fe9fb41 · fe9fb41
2 parents e11f2d6 + e14590b
commit fe9fb41
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 58 deletions.
diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml
@@ -32,11 +32,6 @@ jobs:
             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'
@@ -57,10 +52,6 @@ jobs:
             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
@@ -147,11 +138,6 @@ jobs:
             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'
@@ -172,11 +158,6 @@ jobs:
             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
@@ -247,10 +228,6 @@ jobs:
             conda_ver: 4.10.3
             py_ver: 3.7
             platform: linux/amd64
-          - distro: alpine
-            conda_ver: 4.5.4
-            py_ver: 3.6
-            platform: linux/amd64
           - distro: debian
             conda_ver: 4.12.0
             py_ver: '3.10'
@@ -267,10 +244,6 @@ jobs:
             conda_ver: 4.10.3
             py_ver: 3.7
             platform: linux/amd64
-          - 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

diff --git a/dist/alpine/Dockerfile b/dist/alpine/Dockerfile
@@ -114,14 +114,6 @@ RUN \
 	conda config --add channels conda-forge && \
 	conda config --set auto_update_conda False && \
 	[ "${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'(==|!=|<=|>=|<|>|=)\
-			(?!\[=<>!\])(\\\S\+)$')@g" | tr -d '\n' | tr -d '\t') \
-		/opt/conda/lib/python3.6/site-packages/conda/models/version.py && \
-	[ "${PY_VER}" != "3.6" ] || sed -i \
-		"s|op.__gt__|op.__gt__, '=': lambda x, y: x.startswith(y)|g" \
-		/opt/conda/lib/python${PY_VER}/site-packages/conda/models/version.py && \
 	# allow gui for gnome apps
 	# conda install -yc conda-forge gtk2 && \
 	find /opt/conda/conda-meta -user anaconda -exec chmod u+rwx,g+rwx,o-rwx "{}" \; && \

diff --git a/dist/debian/Dockerfile b/dist/debian/Dockerfile
@@ -59,14 +59,6 @@ RUN \
 	conda config --add channels conda-forge && \
 	conda config --set auto_update_conda False && \
 	[ "${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'(==|!=|<=|>=|<|>|=)\
-			(?!\[=<>!\])(\\\S\+)$')@g" | tr -d '\n' | tr -d '\t') \
-		/opt/conda/lib/python3.6/site-packages/conda/models/version.py && \
-	[ "${PY_VER}" != "3.6" ] || sed -i \
-		"s|op.__gt__|op.__gt__, '=': lambda x, y: x.startswith(y)|g" \
-		/opt/conda/lib/python${PY_VER}/site-packages/conda/models/version.py && \
 	# allow gui for gnome apps
 	# conda install -yc conda-forge gtk2 && \
 	find /opt/conda/conda-meta -user anaconda -exec chmod u+rwx,g+rwx,o-rwx "{}" \; && \

diff --git a/tests/main.sh b/tests/main.sh
@@ -35,17 +35,10 @@ validate () {
 	assert "username" "[ $($SHELL_CMD "id -u -n") == anaconda ]" $LINENO
 	assert "default group" "[ $($SHELL_CMD "id -g -n") == anaconda ]" $LINENO
 	assert "home" "[ $($SHELL_CMD "cd ~ && pwd") == '/home/anaconda' ]" $LINENO
-	if [ $PY_VER == '3.6' ]; then
-		assert "conda channel priority config" "[ $($SHELL_CMD 'eval "$(cat)"' <<-END
-			conda config --show channel_priority | awk -F': ' '{print \$2}'
-		END
-		) == True ]" $LINENO
-	else
-		assert "conda channel priority config" "[ $($SHELL_CMD 'eval "$(cat)"' <<-END
-			conda config --show channel_priority | awk -F': ' '{print \$2}'
-		END
-		) == flexible ]" $LINENO
-	fi
+	assert "conda channel priority config" "[ $($SHELL_CMD 'eval "$(cat)"' <<-END
+		conda config --show channel_priority | awk -F': ' '{print \$2}'
+	END
+	) == flexible ]" $LINENO
 	assert "conda default channel" "[ $($SHELL_CMD 'eval "$(cat)"' <<-END
 		conda config --show channels | head -2 | tail -1 | awk -F'- ' '{print \$2}'
 	END
@@ -168,8 +161,6 @@ elif [ $DISTRO == alpine ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd6
 	SIZE_LIMIT=188
 elif [ $DISTRO == alpine ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd64' ]; then
 	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
@@ -178,8 +169,6 @@ elif [ $DISTRO == debian ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/amd6
 	SIZE_LIMIT=265 #428
 elif [ $DISTRO == debian ] && [ $PY_VER == '3.7' ] && [ $PLATFORM == 'linux/amd64' ]; then
 	SIZE_LIMIT=269 #437
-elif [ $DISTRO == debian ] && [ $PY_VER == '3.6' ] && [ $PLATFORM == 'linux/amd64' ]; then
-	SIZE_LIMIT=228 #396
 elif [ $DISTRO == debian ] && [ $PY_VER == '3.9' ] && [ $PLATFORM == 'linux/arm64' ]; then
 	SIZE_LIMIT=505
 elif [ $DISTRO == debian ] && [ $PY_VER == '3.8' ] && [ $PLATFORM == 'linux/arm64' ]; then