diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index 1e6a75277e9111a55c19db84b29a95edaaeb3271..aa509c1d4090405c17fdba033f0a1e09ef7ba7be 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -990,12 +990,6 @@ export LIBXMLVER=2.9.9 export PYPY3VER=6.0.0 export PYPY3FSVER=3.5 -export STACKLESS3VER=364 -export STACKLESS3FSVER=3.6 - -export PY36VER=3.6.12 -export PY36FSVER=3.6 - export PY37VER=3.7.9 export PY37FSVER=3.7 @@ -1034,8 +1028,6 @@ fi export OPENBLASVER=0.3.13 export NUMPYVER=1.20.1 -export NUMPYOLDVER=1.19.5 -export NUMPYMACVER=1.18.5 export JASPERVER=2.0.14 export PYGRIBVER=2.1.3 @@ -1065,8 +1057,6 @@ export GNUREADLINEVER=8.0.0 export SWIGVER=3.0.12 export SUITESPARSEVER=5.8.1 export METISVER=5.1.0 -export SCIPYMACVER=1.1.0 -export SCIPYOLDVER=1.5.4 export SCIPYVER=1.6.1 # optional packages @@ -2882,6 +2872,7 @@ if isDarwin ; then # scipy explicitly updated to lapack 3.4+, while accelerate is stuck in 3.2 if isTrue MAC_ACCELERATE_NOOPENBLAS ; then export USE_PORTABLE_ACCELERATE=YES USE_PORTABLE_BLASLAPACK=YES + oops "Accelerate isn't supported. Stick with OpenBLAS" fi if isNotTrue USE_PORTABLE_BLASLAPACK ; then export SYS_FORBIDDENLIBS="${SYS_FORBIDDENLIBS},libblas,libcblas,liblapack" @@ -3660,7 +3651,7 @@ mk_apy() { elif [ $( nativeOpenSSLVersion ) -ge 102 ] ; then mk_py38 "$@" else - mk_py36 "$@" + oops "System doesn't support OpenSSL 1.0.2 or newer" fi elif [ "${__PYTHON_VERSION}" == 39 ] ; then mk_py39 "$@" @@ -3668,8 +3659,6 @@ mk_apy() { mk_py38 "$@" elif [ "${__PYTHON_VERSION}" == 37 ] ; then mk_py37 "$@" - elif [ "${__PYTHON_VERSION}" == 36 ] ; then - mk_py36 "$@" else oops "Don't have rules to build Python version \"${__PYTHON_VERSION}\"" fi @@ -3725,15 +3714,6 @@ mk_py38(){ return 0 } -mk_py36(){ - resume_tracker && return 0 - trimname=py _mk_py "Python3.6" \ - src/Python-${PY36VER}.t* \ - Python-${PY36VER} $PY36FSVER "$@" - rm bin/python ; ln -s python3 bin/python - return 0 -} - mk_py37(){ resume_tracker && return 0 trimname=py _mk_py "Python3.7" \ @@ -4161,9 +4141,6 @@ mk_numpy() { export BLASLIBDIR="${OPENBLASLIBDIR}" BLAS="${OPENBLAS}" BLASLIB=openblas export LAPACKLIBDIR="${OPENBLASLIBDIR}" LAPACK="${OPENBLAS}" LAPACKLIB=openblas fi - if [ ${NUMPYUSEVER} == ${NUMPYVER} -a ${PYFSVER} == 3.6 ] ; then - export NUMPYUSEVER=${NUMPYOLDVER} - fi if isTrue USING_FLANG ; then export FLIB=flang @@ -5009,9 +4986,6 @@ mk_scipy() { else _find_cots_lib OPENBLAS libopenblas $BASE $COTS_HOME || oops "scipy requires openblas" fi - if [ ${SCIPYUSEVER} == ${SCIPYVER} -a ${PYFSVER} == 3.6 ] ; then - export SCIPYUSEVER=${SCIPYOLDVER} - fi if isTrue USING_FLANG ; then export FLIB=flang @@ -8926,9 +8900,6 @@ mk_ipython() { pip_install src/optional/snowballstemmer-*z || oops 'snowballstemmer did not install' pip_install src/optional/Babel-*z || oops 'Babel did not install' pip_install --no-deps src/optional/alabaster*z src/optional/Sphinx-${SPHINXVER}.tar.gz || oops 'Sphinx did not install' - if [ ${PYFSVER} == "3.6" ] ; then - pip_install src/optional/typing-* || oops 'typing did not install' - fi pip_install src/optional/Whoosh-* || oops 'Whoosh did not install' pip_install src/optional/sphinxcontrib-serializinghtml-* || oops "sphinxcontrib-serializinghtml did not install" pip_install src/optional/sphinxcontrib-websupport-* || oops "sphinxcontrib-websupport did not install" diff --git a/ShellB3/src/Python-3.6.12.tar.xz b/ShellB3/src/Python-3.6.12.tar.xz deleted file mode 100644 index b43adcb9037f0e9cedda0f4091ef28aa19df8814..0000000000000000000000000000000000000000 --- a/ShellB3/src/Python-3.6.12.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70953a9b5d6891d92e65d184c3512126a15814bee15e1eff2ddcce04334e9a99 -size 17202980 diff --git a/ShellB3/src/numpy-1.18.5.zip b/ShellB3/src/numpy-1.18.5.zip deleted file mode 100644 index ec954a52c9c3474758986367e554d25d3b4ef942..0000000000000000000000000000000000000000 --- a/ShellB3/src/numpy-1.18.5.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34e96e9dae65c4839bd80012023aadd6ee2ccb73ce7fdf3074c62f301e63120b -size 5441636 diff --git a/ShellB3/src/numpy-1.19.5.zip b/ShellB3/src/numpy-1.19.5.zip deleted file mode 100644 index 3dba392555ed4f55090cad6e2130e780302d6a40..0000000000000000000000000000000000000000 --- a/ShellB3/src/numpy-1.19.5.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a76f502430dd98d7546e1ea2250a7360c065a5fdea52b2dffe8ae7180909b6f4 -size 7318340 diff --git a/ShellB3/src/optional/typing-3.7.4.3.tar.gz b/ShellB3/src/optional/typing-3.7.4.3.tar.gz deleted file mode 100644 index 90826091863c39c9e3c434ef8e3622551ea4a464..0000000000000000000000000000000000000000 --- a/ShellB3/src/optional/typing-3.7.4.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9 -size 78592 diff --git a/ShellB3/src/scipy-1.1.0.tar.gz b/ShellB3/src/scipy-1.1.0.tar.gz deleted file mode 100644 index 0f44328d551c7a9bc7932e3cbb21c3b7a699836d..0000000000000000000000000000000000000000 --- a/ShellB3/src/scipy-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:878352408424dffaa695ffedf2f9f92844e116686923ed9aa8626fc30d32cfd1 -size 15583560 diff --git a/ShellB3/src/scipy-1.5.4.tar.gz b/ShellB3/src/scipy-1.5.4.tar.gz deleted file mode 100644 index e19c0bcb24ed6f995a954443122482dbdd8a615f..0000000000000000000000000000000000000000 --- a/ShellB3/src/scipy-1.5.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a453d5e5689de62e5d38edf40af3f17560bfd63c9c5bd228c18c1f99afa155b -size 25237512