Skip to content

Commit c7ee84e

Browse files
author
Ram Mehta
committed
Upgrade numpy scipy and various other dependencies.
Still unable to upgrade matplotlib to 1.3.1.
1 parent 4b0ad60 commit c7ee84e

24 files changed

+28
-11
lines changed
1.32 MB
Binary file not shown.
-5.65 MB
Binary file not shown.
8.26 MB
Binary file not shown.
40.2 MB
Binary file not shown.
-391 KB
Binary file not shown.
395 KB
Binary file not shown.
-2.47 MB
Binary file not shown.
3.6 MB
Binary file not shown.
9.56 KB
Binary file not shown.
1.51 MB
Binary file not shown.
1.08 MB
Binary file not shown.
Binary file not shown.
846 KB
Binary file not shown.
-771 KB
Binary file not shown.
-3.32 MB
Binary file not shown.
Binary file not shown.
20.9 KB
Binary file not shown.
-340 KB
Binary file not shown.
365 KB
Binary file not shown.

requirements-ipython.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1+
ipython==1.1.0
12
pygments==1.6
2-
pyzmq==2.2.0.1
3-
tornado==2.4.1
4-
ipython==0.13.1
3+
pyzmq==14.0.0
4+
tornado==3.1.1

requirements.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
cython==0.19.1
1+
cython==0.19.2
22
flake8==2.0
3-
Imaging==1.1.7
4-
matplotlib==1.2.0
3+
imaging==1.1.7
4+
matplotlib==1.3.1
55
mccabe==0.2
66
method_decorator==0.1.3
77
mpmath==0.17
88
networkx==1.7
9-
nose==1.2.1
9+
nose==1.3.0
1010
pep8==1.4.5
11+
purehuff==0.2
1112
pyflakes==0.6.1
13+
pyparsing==2.0.1
1214
# pyside==1.1.2
13-
scikit-learn==0.13.1
14-
scipy==0.12.0
15+
python-dateutil==2.2
16+
scikit-learn==0.14.1
17+
scipy==0.13.1
18+
six==1.4.1
1519
sympy==0.7.2

waftools/modules.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ def module(ctx, module, configure="", numthreads=4, **kwargs):
5656
return ctx(rule=lambda target: ctx.venv_exec(srcscript), **kwargs)
5757

5858

59+
@conf
60+
def symlink_freetype(ctx, target):
61+
includepath = os.path.join(ctx.out_dir, "include")
62+
srcpath = "/usr/X11/include/freetype2/freetype"
63+
dstpath = os.path.join(includepath, "freetype")
64+
if not os.path.exists(dstpath):
65+
os.symlink(srcpath, dstpath)
66+
67+
5968
@conf
6069
def build_freetype2(ctx, target):
6170
srcscript = ctx.module_builder("freetype-2.1.10")

wscript

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# encoding: utf-8
33
import os
44
import platform
5+
import subprocess
56
import sys
67

78

@@ -39,6 +40,7 @@ def build(ctx):
3940
readlinecmd = ctx.venv("easy_install --no-find-links %s && touch ${TGT}" % readlinetar)
4041
ctx(rule=readlinecmd, source="../bin/pkg-config", target="../.readline-done")
4142
platform_deps.append("../.readline-done")
43+
4244
else:
4345
# We assume that a fortran compiler with lapack is installed.
4446
# It may be installed using:
@@ -58,9 +60,12 @@ def build(ctx):
5860
# Install numpy separately due to bug in scipy install script.
5961
site_packages = os.path.join("..", "lib", "python2.7", "site-packages")
6062
numpy = os.path.join(site_packages, "numpy", "__init__.py")
61-
ctx(rule=ctx.venv("pip install numpy==1.6.2 --no-index -f file://%s" % pkg),
63+
ctx(rule=ctx.venv("pip install numpy==1.8.0 --no-index -f file://%s" % pkg),
6264
source=platform_deps, target=numpy)
6365

66+
# pycuda = os.path.join(site_packages, "pycuda", "__init__.py")
67+
# ctx.module("pycuda-2013.1.1", source=numpy, target="../lib/libzmq.a")
68+
6469
# Install cvxopt separately due to misplaced setup.py file.
6570
cvxopt = os.path.join(site_packages, "cvxopt", "__init__.py")
6671
ctx(rule=ctx.build_cvxopt, source=numpy, target=cvxopt)
@@ -87,4 +92,3 @@ def build(ctx):
8792
],
8893
target="../.requirements-done")
8994
ctx.add_manual_dependency("../.requirements-done", ctx.path.find_node("requirements.txt"))
90-
ctx(rule="touch ${TGT}", source="../.requirements-done", target="../../.build-done")

0 commit comments

Comments
 (0)