diff --git a/CHANGELOG.md b/CHANGELOG.md index eb6c3ee5b..1da5ccacf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Qiita changelog -Version 0.1.0 (2015-04-29) +Version 0.1.0 (2015-04-30) -------------------------- Initial alpha release. diff --git a/INSTALL.md b/INSTALL.md index 484a3c053..33e08e33b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -66,7 +66,7 @@ After these commands are executed, you will need to: qiita webserver start ``` -If all the above commands executed correctly, you should be able to go to http://localhost:21174 in your browser, to login use `demo@microbio.me` 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).) +If all the above commands executed correctly, you should be able to go to http://localhost:21174 in your browser, to login use `test@foo.bar` 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).) ## Installation issues on Ubuntu 14.04 @@ -104,3 +104,12 @@ If running on OS X you should make sure that the Xcode and the Xcode command lin ### postgres 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. + +## Troubleshooting installation issues with Python + +As a general rule of thumb you will want to have an updated version of Python +2.7 and an updated version of pip (`pip install -U pip` will do the trick). + +H5PY is known to cause a few problems, however their [installation +instructions](http://docs.h5py.org/en/latest/build.html) are a great resource +to troubleshoot your system in case any of the steps above fail. diff --git a/setup.py b/setup.py index 34d0f7af2..b1ce04d2e 100644 --- a/setup.py +++ b/setup.py @@ -71,11 +71,13 @@ 'static/img/*.gif', 'static/img/*.ico', 'static/js/*.js', 'static/vendor/css/*.css', 'static/vendor/css/images/*.png', + 'static/vendor/css/*.png', 'static/vendor/fonts/glyphicons*.*', 'static/vendor/images/*.png', 'static/vendor/js/*.js', 'results/admin/jobname/*.html', - 'templates/*.html']}, + 'templates/*.html', + 'templates/study_description_templates/*.html']}, scripts=glob('scripts/*'), extras_require={'test': ["nose >= 0.10.1", "pep8", 'mock'], 'doc': ["Sphinx >= 1.2.2", "sphinx-bootstrap-theme"]},