Skip to content

Commit 4e33ec1

Browse files
committed
Merge pull request #1165 from UV-CDAT/issue_966_new_scipy
Issue 966 new scipy
2 parents c0aa782 + bb5ab2c commit 4e33ec1

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(SCIPY_deps ${numpy_pkg})
1+
set(SCIPY_deps ${numpy_pkg} ${cython_pkg})

CMake/cdat_modules/scipy_pkg.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
set(SCIPY_MAJOR 0)
22
set(SCIPY_MINOR 10)
33
set(SCIPY_PATCH 0)
4-
set(SCIPY_MAJOR_SRC 0)
5-
set(SCIPY_MINOR_SRC 15)
6-
set(SCIPY_PATCH_SRC 1)
4+
set(SCIPY_MAJOR_SRC dde07a64407ffaa9442b3d8298c6c26ff91fb384)
5+
set(SCIPY_MINOR_SRC)
6+
set(SCIPY_PATCH_SRC)
77
set(SCIPY_URL ${LLNL_URL})
8-
set(SCIPY_GZ scipy-${SCIPY_MAJOR_SRC}.${SCIPY_MINOR_SRC}.${SCIPY_PATCH_SRC}.tar.gz)
9-
set(SCIPY_MD5 be56cd8e60591d6332aac792a5880110)
8+
set(SCIPY_GZ scipy-dde07a64407ffaa9442b3d8298c6c26ff91fb384.zip)
9+
set(SCIPY_MD5 03fed4942984c0220615fac2d8d675c7)
1010
set(SCIPY_SOURCE ${SCIPY_URL}/${SCIPY_GZ})
1111

1212
set (nm SCIPY)
1313
string(TOUPPER ${nm} uc_nm)
14-
set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC}.${${nm}_MINOR_SRC}.${${nm}_PATCH_SRC})
14+
set(${uc_nm}_VERSION ${${nm}_MAJOR_SRC})
1515

1616
add_cdat_package_dependent(SCIPY "" "" OFF "CDAT_BUILD_LEAN" ON)

0 commit comments

Comments
 (0)