diff options
| author | Lei Yan | 2013-09-13 14:07:27 -0500 |
|---|---|---|
| committer | Lei Yan | 2013-09-13 14:07:27 -0500 |
| commit | af24c0d610d9a2189f86677e4f23deb372ee2bf7 (patch) | |
| tree | 53480351b97727670637a37dbd4c78e52446ae88 /wqflask/requirements.txt | |
| parent | 155e2997613c0750de30b734686f8977524956f9 (diff) | |
| parent | c5fc931621707865357ace4b637db7481e0be552 (diff) | |
| download | genenetwork2-af24c0d610d9a2189f86677e4f23deb372ee2bf7.tar.gz | |
Merge https://github.com/zsloan/genenetwork
Resolved conflicts:
wqflask/base/trait.py
wqflask/wqflask/correlation/correlationFunction.py
wqflask/wqflask/correlation/correlation_function.py
wqflask/wqflask/correlation/correlation_functions.py
wqflask/wqflask/correlation/show_corr_results.py
Diffstat (limited to 'wqflask/requirements.txt')
| -rw-r--r-- | wqflask/requirements.txt | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/wqflask/requirements.txt b/wqflask/requirements.txt deleted file mode 100644 index 4449c0e7..00000000 --- a/wqflask/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -Flask==0.9 -Jinja2==2.6 -#MySQL-python==1.2.3 -Piddle==0.1-dev -PyYAML==3.10 -SQLAlchemy==0.7.9 -Werkzeug==0.8.3 -logging-tree==1.1 -nose==1.2.1 -numpy==1.6.2 -pp==1.6.3 -requests==0.13.3 -rpy2==2.3.1 -scipy==0.11.0 -simplejson==2.6.2 -wsgiref==0.1.2 -yolk==0.4.3 |