diff --git a/ShellB3/shallbethree.sh b/ShellB3/shallbethree.sh index 3ed76016363f9cffb3ea39f0574864810f0b3a48..d2b4cf166fffb3ae4e30d55e56cec779d16bbd9a 100755 --- a/ShellB3/shallbethree.sh +++ b/ShellB3/shallbethree.sh @@ -513,7 +513,7 @@ if [ -n "$COTS_HOME" ]; then fi export LAPACKVER=3.5.0 -export NUMPYVER=1.9.2 +export NUMPYVER=1.10.0 export JASPERVER=1.900.1 export GRIBAPIVER=1.14.0-Source @@ -526,11 +526,10 @@ export H5PYVER=2.5.0 export CYTHONVER=0.23.3 export NUMEXPRVER=2.4.4 -export CBLOSCVER=20150728-e21b6ac513c58b18b55e8c57ff90627d355510f4 export BLOSCVER=1.2.8 export PYTABLESVER=3.2.2 -export PLYVER=3.6 +export PLYVER=3.8 export SWIGVER=3.0.7 export SUITESPARSEVER=4.4.4 @@ -541,7 +540,7 @@ export DISTRIBUTEVER=0.6.28 export SETUPTOOLSVER=18.3.2 export ATLASVER=3.10.1 export EUGENEVER=4.9.2 -export HARFBUZZVER=1.0.3 +export HARFBUZZVER=1.0.4 export GLIBVER=2.44.1 export ICUVER=55_1 export FREETYPEVER=2.6 @@ -583,7 +582,7 @@ export LLVMLITEVER=0.7.0 export NUMBAVER=0.21.0 export ENUM34VER=1.0.4 export POCLVER=0.11 -export REQUESTSVER=2.7.0 +export REQUESTSVER=2.8.0 export PIPVER=7.1.0 export DATEUTILVER=2.4.2 export PYPARSINGVER=2.0.3 @@ -597,9 +596,9 @@ export PYOPENGLVER=3.1.1a1 export LIBFFIVER=3.2.1 export PYCPARSERVER=2.14 export CFFIVER=1.2.1 -export PILLOWVER=2.9.0 +export PILLOWVER=3.0.0 -export MINIPGVER=0.5.4 +export MINIPGVER=0.5.5 export MODULEGRAPHVER=0.12.1 export ALTGRAPHVER=0.12 @@ -2274,18 +2273,6 @@ mk_numexpr() { _setup_build_install numexpr src/numexpr-${NUMEXPRVER}.tar.gz numexpr-${NUMEXPRVER} } -mk_cblosc() { - resume_tracker && return 0 - _find_cots CMAKE_EXEC cmake $BASE/sysbin $COTS_HOME/bin ${SYSROOT}/usr/bin /sw/bin /opt/local/bin || return 0 - _cmake_make_install c-blosc src/optional/c-blosc-${CBLOSCVER}.tar.gz c-blosc-${CBLOSCVER} - isDarwin && for f in lib/libblosc*.dylib ; do \ - if [ -f $f ] ; then \ - install_name_tool -id ${BASE}/$f $f ;\ - fi ;\ - done - return 0 -} - mk_blosc() { resume_tracker && return 0 _find_cots BLOSC include/blosc.h $BASE $COTS_HOME diff --git a/ShellB3/src/numpy-1.10.0.tar.gz b/ShellB3/src/numpy-1.10.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..fd245f2342c37cfcf6177850bce052e14ed58eb9 Binary files /dev/null and b/ShellB3/src/numpy-1.10.0.tar.gz differ diff --git a/ShellB3/src/numpy-1.9.2.tar.gz b/ShellB3/src/numpy-1.9.2.tar.gz deleted file mode 100644 index 0cba5e78fa1c101a2f8d757f2bbad769ca157b79..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/numpy-1.9.2.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/Pillow-2.9.0.tar.gz b/ShellB3/src/optional/Pillow-3.0.0.tar.gz similarity index 60% rename from ShellB3/src/optional/Pillow-2.9.0.tar.gz rename to ShellB3/src/optional/Pillow-3.0.0.tar.gz index 068cb02c2a746b8fd6b0fe57327621775b68c872..eac810646832e77c1f02f7b8bd95b425cbdab2ed 100644 Binary files a/ShellB3/src/optional/Pillow-2.9.0.tar.gz and b/ShellB3/src/optional/Pillow-3.0.0.tar.gz differ diff --git a/ShellB3/src/optional/c-blosc-20150728-e21b6ac513c58b18b55e8c57ff90627d355510f4.tar.gz b/ShellB3/src/optional/c-blosc-20150728-e21b6ac513c58b18b55e8c57ff90627d355510f4.tar.gz deleted file mode 100644 index d5f215e6a8b8be52cbc6b9a319bb4eae936bd458..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/c-blosc-20150728-e21b6ac513c58b18b55e8c57ff90627d355510f4.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/harfbuzz-1.0.3.tar.bz2 b/ShellB3/src/optional/harfbuzz-1.0.3.tar.bz2 deleted file mode 100644 index 9bb96a7d04a3970f02d9b3e626d0d7315dc00bb2..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/harfbuzz-1.0.3.tar.bz2 and /dev/null differ diff --git a/ShellB3/src/optional/harfbuzz-1.0.4.tar.bz2 b/ShellB3/src/optional/harfbuzz-1.0.4.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..42df3d61d16aa0e11534ee6e65ec15dd0f8190df Binary files /dev/null and b/ShellB3/src/optional/harfbuzz-1.0.4.tar.bz2 differ diff --git a/ShellB3/src/optional/minipg-0.5.4.tar.gz b/ShellB3/src/optional/minipg-0.5.4.tar.gz deleted file mode 100644 index 67198d861ba2cdd8a35f29e1ee5b0aa279735df6..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/minipg-0.5.4.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/minipg-0.5.5.tar.gz b/ShellB3/src/optional/minipg-0.5.5.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ceecfbf05cf46c41ac3ba9a791203237e282f124 Binary files /dev/null and b/ShellB3/src/optional/minipg-0.5.5.tar.gz differ diff --git a/ShellB3/src/optional/path.py-8.1.1.tar.gz b/ShellB3/src/optional/path.py-8.1.1.tar.gz deleted file mode 100644 index 54188020afd7d67891e95e04222d48ab5d04517d..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/path.py-8.1.1.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/path.py-8.1.2.tar.gz b/ShellB3/src/optional/path.py-8.1.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d01efb255b829e6794a3f990841679f52cd8c5cf Binary files /dev/null and b/ShellB3/src/optional/path.py-8.1.2.tar.gz differ diff --git a/ShellB3/src/optional/pexpect-3.3.tar.gz b/ShellB3/src/optional/pexpect-3.3.tar.gz deleted file mode 100644 index 3da3e55d262af393f483ca1c9f7c29c6befa0cda..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/pexpect-3.3.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/pexpect-4.0.1.tar.gz b/ShellB3/src/optional/pexpect-4.0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..7c832f95594a8fd4525a774149d4f7a33b807b0d Binary files /dev/null and b/ShellB3/src/optional/pexpect-4.0.1.tar.gz differ diff --git a/ShellB3/src/optional/ply-3.6.tar.gz b/ShellB3/src/optional/ply-3.6.tar.gz deleted file mode 100644 index 1c9fbf6ca580a900f18bc616b6a1f6e56b174844..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/ply-3.6.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/ply-3.8.tar.gz b/ShellB3/src/optional/ply-3.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..67cf681c45f593fd1ea8877b8cc3a54ec7566432 Binary files /dev/null and b/ShellB3/src/optional/ply-3.8.tar.gz differ diff --git a/ShellB3/src/optional/requests-2.7.0.tar.gz b/ShellB3/src/optional/requests-2.7.0.tar.gz deleted file mode 100644 index 0a67c730d488cd1c97ff508c8bb8ce71c2085554..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/requests-2.7.0.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/requests-2.8.0.tar.gz b/ShellB3/src/optional/requests-2.8.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6ec26db1662af17369b3f716cca0ffe9f815a662 Binary files /dev/null and b/ShellB3/src/optional/requests-2.8.0.tar.gz differ diff --git a/ShellB3/src/optional/zope.interface-4.1.2.tar.gz b/ShellB3/src/optional/zope.interface-4.1.2.tar.gz deleted file mode 100644 index 303f423238a643a28387d0dc283a6f3558f8d2ce..0000000000000000000000000000000000000000 Binary files a/ShellB3/src/optional/zope.interface-4.1.2.tar.gz and /dev/null differ diff --git a/ShellB3/src/optional/zope.interface-4.1.3.tar.gz b/ShellB3/src/optional/zope.interface-4.1.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c9e652fc6bceb288fc62720fb1c8346dfc0cf910 Binary files /dev/null and b/ShellB3/src/optional/zope.interface-4.1.3.tar.gz differ