Skip to content

Commit

Permalink
Merge pull request #1138 from ElDeveloper/alpha-0.1-release
Browse files Browse the repository at this point in the history
REL: Final fixes for alpha-0.1
  • Loading branch information
antgonza committed Apr 30, 2015
2 parents acd4d9c + b94080b commit 7c6972b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Qiita changelog

Version 0.1.0 (2015-04-29)
Version 0.1.0 (2015-04-30)
--------------------------

Initial alpha release.
11 changes: 10 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `[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).)
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).)

## Installation issues on Ubuntu 14.04

Expand Down Expand Up @@ -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.
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]},
Expand Down

0 comments on commit 7c6972b

Please sign in to comment.