Skip to content

Commit 7c6972b

Browse files
committed
Merge pull request #1138 from ElDeveloper/alpha-0.1-release
REL: Final fixes for alpha-0.1
2 parents acd4d9c + b94080b commit 7c6972b

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Qiita changelog
22

3-
Version 0.1.0 (2015-04-29)
3+
Version 0.1.0 (2015-04-30)
44
--------------------------
55

66
Initial alpha release.

INSTALL.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ After these commands are executed, you will need to:
6666
qiita webserver start
6767
```
6868

69-
If all the above commands executed correctly, you should be able to go to http://localhost:21174 in your browser, to login use `[email protected]` and `password` as the credentials. (In the future, we will have a *single user mode* that will allow you to use a local Qiita server without logging in. You can track progress on this on issue [#920](https://github.com/biocore/qiita/issues/920).)
69+
If all the above commands executed correctly, you should be able to go to http://localhost:21174 in your browser, to login use `[email protected]` and `password` as the credentials. (In the future, we will have a *single user mode* that will allow you to use a local Qiita server without logging in. You can track progress on this on issue [#920](https://github.com/biocore/qiita/issues/920).)
7070

7171
## Installation issues on Ubuntu 14.04
7272

@@ -104,3 +104,12 @@ If running on OS X you should make sure that the Xcode and the Xcode command lin
104104
### postgres
105105

106106
If you are using Postgres.app on OSX, a database user will be created with your system username. If you want to use this user account, change the `USER` and `ADMIN_USER` settings to your username under the `[postgres]` section of your Qiita config file.
107+
108+
## Troubleshooting installation issues with Python
109+
110+
As a general rule of thumb you will want to have an updated version of Python
111+
2.7 and an updated version of pip (`pip install -U pip` will do the trick).
112+
113+
H5PY is known to cause a few problems, however their [installation
114+
instructions](http://docs.h5py.org/en/latest/build.html) are a great resource
115+
to troubleshoot your system in case any of the steps above fail.

setup.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,13 @@
7171
'static/img/*.gif', 'static/img/*.ico',
7272
'static/js/*.js', 'static/vendor/css/*.css',
7373
'static/vendor/css/images/*.png',
74+
'static/vendor/css/*.png',
7475
'static/vendor/fonts/glyphicons*.*',
7576
'static/vendor/images/*.png',
7677
'static/vendor/js/*.js',
7778
'results/admin/jobname/*.html',
78-
'templates/*.html']},
79+
'templates/*.html',
80+
'templates/study_description_templates/*.html']},
7981
scripts=glob('scripts/*'),
8082
extras_require={'test': ["nose >= 0.10.1", "pep8", 'mock'],
8183
'doc': ["Sphinx >= 1.2.2", "sphinx-bootstrap-theme"]},

0 commit comments

Comments
 (0)