Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue1127 durack1 ipython3.0 update #1130

Closed
wants to merge 5 commits into from
Closed

Issue1127 durack1 ipython3.0 update #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7c3fe8
Merge branch 'master' into durack1_master
durack1 Mar 7, 2015
a39c528
Fix #1127 - IPython 3.0 update
durack1 Mar 7, 2015
df659f5
Trigger new travis build
durack1 Apr 27, 2015
929f523
Updated tar ball and MD5 as previous was missing git submodules
durack1 May 7, 2015
c1f0737
Following #1261 turning off osx build for travis tests
durack1 May 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
os:
- linux
- osx
# - osx

language: c++

Expand Down
10 changes: 5 additions & 5 deletions CMake/cdat_modules/ipython_pkg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
set(IPYTHON_MAJOR 2)
set(IPYTHON_MINOR 4)
set(IPYTHON_PATCH 1)
set(IPYTHON_VERSION ${IPYTHON_MAJOR}.${IPYTHON_MINOR}.${IPYTHON_PATCH} )
set(IPYTHON_MAJOR 3)
set(IPYTHON_MINOR 0)
set(IPYTHON_PATCH 0)
set(IPYTHON_VERSION ${IPYTHON_MAJOR}.${IPYTHON_MINOR}.${IPYTHON_PATCH})
set(IPYTHON_URL ${LLNL_URL})
set(IPYTHON_GZ ipython-${IPYTHON_VERSION}.tar.gz)
set(IPYTHON_MD5 70149981d6515d77ecb3d7507de2d7d9)
set(IPYTHON_MD5 b3f00f3c0be036fafef3b0b9d663f27e)

set(IPYTHON_SOURCE ${IPYTHON_URL}/${IPYTHON_GZ})

Expand Down