Skip to content

Commit e2b50cd

Browse files
committed
Merge pull request #1135 from ElDeveloper/alpha-0.1-release
MAINT: Updates for 0.1 alpha release
2 parents aa6d35d + be2f83e commit e2b50cd

File tree

12 files changed

+61
-30
lines changed

12 files changed

+61
-30
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Qiita changelog
2+
3+
Version 0.1.0 (2015-04-29)
4+
--------------------------
5+
6+
Initial alpha release.

INSTALL.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ Install the non-python dependencies
99
* [PostgreSQL](http://www.postgresql.org/download/) (we have tested most extensively with 9.3)
1010
* [redis-server](http://redis.io) (we have tested most extensively with 2.8.17)
1111

12-
Install both of these packages according to the instructions on their websites. You'll then need to ensure that the postgres binaries (for example, ``psql``) are in your executable search path (``$PATH`` environment variable).
12+
Install both of these packages according to the instructions on their websites.
13+
You'll then need to ensure that the postgres binaries (for example, ``psql``)
14+
are in your executable search path (``$PATH`` environment variable). For
15+
example if you are using Postgres.app on OS X, you can do this by addint
16+
the following line to your `.bash_profile`:
17+
18+
```bash
19+
export PATH=$PATH:/Applications/Postgres.app/Contents/Versions/9.3/bin/
20+
```
1321

1422
Install Qiita and its python dependencies
1523
-----------------------------------------
@@ -29,7 +37,7 @@ After these commands are executed, you will need to:
2937

3038
```bash
3139
cd
32-
curl -O https://raw.githubusercontent.com/biocore/qiita/master/qiita_core/support_files/config_test.txt > config_test.txt
40+
curl -O https://raw.githubusercontent.com/biocore/qiita/master/qiita_core/support_files/config_test.txt
3341
```
3442

3543
2. Set your `QIITA_CONFIG_FP` environment variable to point to that file:
@@ -46,10 +54,15 @@ After these commands are executed, you will need to:
4654
qiita_env make --no-load-ontologies
4755
```
4856

49-
4. Finally you can start the server:
57+
4. Start the redis server:
58+
```bash
59+
redis-server
60+
```
61+
62+
5. Finally you can start the server:
5063

5164
```bash
52-
qiita_env start_cluster demo test reserved && sleep 30
65+
qiita_env start_cluster qiita_general && sleep 30
5366
qiita webserver start
5467
```
5568

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include README.md
1+
include README.rst
22
include INSTALL.md
33
include LICENSE
44

README.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

README.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Qiita
2+
=====
3+
4+
|Build Status| |Coverage Status| |Gitter|
5+
6+
Qiita (canonically pronounced *cheetah*) is an analysis environment for microbiome (and other "comparative -omics") datasets. You can find the public Qiita server at `http://qiita.microbio.me <http://qiita.microbio.me>`__.
7+
8+
Qiita is currently in alpha status. We are very open to community contributions and feedback. If you're interested in contributing to Qiita, see `CONTRIBUTING.md <https://github.com/biocore/qiita/blob/master/CONTRIBUTING.md>`__. If you'd like to report bugs or request features, you can do that in the `Qiita issue tracker <https://github.com/biocore/qiita/issues>`__.
9+
10+
To install and configure your own Qiita server, see `INSTALL.md <https://github.com/biocore/qiita/blob/master/INSTALL.md>`__.
11+
12+
13+
.. |Build Status| image:: https://travis-ci.org/biocore/qiita.png?branch=master
14+
:target: https://travis-ci.org/biocore/qiita
15+
.. |Coverage Status| image:: https://coveralls.io/repos/biocore/qiita/badge.png?branch=master
16+
:target: https://coveralls.io/r/biocore/qiita
17+
.. |Gitter| image:: https://badges.gitter.im/Join%20Chat.svg
18+
:target: https://gitter.im/biocore/qiita?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge

qiita_core/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# The full license is in the file LICENSE, distributed with this software.
77
# -----------------------------------------------------------------------------
88

9-
__version__ = "0.0.1-dev"
9+
__version__ = "0.1.0"

qiita_db/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# The full license is in the file LICENSE, distributed with this software.
77
# -----------------------------------------------------------------------------
88

9-
__version__ = "0.0.1-dev"
9+
__version__ = "0.1.0"

qiita_db/environment_manager.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def _add_ontology_data(conn):
9494
"To download the file again, delete the existing file first."
9595
% fp)
9696
else:
97-
url = 'ftp://thebeast.colorado.edu/pub/qiita/qiita_ontoandvocab.sql.gz'
97+
url = 'ftp://ftp.microbio.me/pub/qiita/qiita_ontoandvocab.sql.gz'
9898
try:
9999
urlretrieve(url, fp)
100100
except:
@@ -121,13 +121,13 @@ def _download_reference_files(conn):
121121
mkdir(reference_base_dir)
122122

123123
files = {'tree': (get_reference_fp('gg_13_8-97_otus.tree'),
124-
'ftp://thebeast.colorado.edu/greengenes_release/'
124+
'ftp://ftp.microbio.me/greengenes_release/'
125125
'gg_13_8_otus/trees/97_otus.tree'),
126126
'taxonomy': (get_reference_fp('gg_13_8-97_otu_taxonomy.txt'),
127-
'ftp://thebeast.colorado.edu/greengenes_release/'
127+
'ftp://ftp.microbio.me/greengenes_release/'
128128
'gg_13_8_otus/taxonomy/97_otu_taxonomy.txt'),
129129
'sequence': (get_reference_fp('gg_13_8-97_otus.fasta'),
130-
'ftp://thebeast.colorado.edu/greengenes_release/'
130+
'ftp://ftp.microbio.me/greengenes_release/'
131131
'gg_13_8_otus/rep_set/97_otus.fasta')}
132132

133133
for file_type, (local_fp, url) in viewitems(files):
@@ -231,6 +231,11 @@ def make_environment(load_ontologies, download_reference, add_demo_user):
231231
232232
'$2a$12$gnUi8Qg.0tvW243v889BhOBhWLIHyIJjjgaG6dxuRJkUM8nXG9Efe',
233233
'Demo', 'Qitta Dev', '1345 Colorado Avenue', '303-492-1984')""")
234+
conn.execute("""
235+
INSERT INTO qiita.analysis (email, name, description, dflt,
236+
analysis_status_id)
237+
VALUES
238+
('[email protected]', '[email protected]', 'dflt', 't', 1)""")
234239

235240
print('Demo user successfully created')
236241

qiita_db/metadata_template/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from .util import load_template_to_dataframe
1212
from .constants import TARGET_GENE_DATA_TYPES
1313

14-
__version__ = "0.0.1-dev"
1514

1615
__all__ = ['SampleTemplate', 'PrepTemplate', 'load_template_to_dataframe',
1716
'TARGET_GENE_DATA_TYPES']

qiita_pet/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
'IE': 10
1414
}
1515

16-
__version__ = "0.0.1-dev"
16+
__version__ = "0.1.0"

qiita_ware/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# The full license is in the file LICENSE, distributed with this software.
77
# -----------------------------------------------------------------------------
88

9-
__version__ = "0.0.1-dev"
9+
__version__ = "0.1.0"

setup.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
from setuptools import setup
1111
from glob import glob
1212

13-
__version__ = "0.0.1-dev"
13+
__version__ = "0.1.0"
1414

1515

1616
classes = """
17-
Development Status :: 2 - Pre-Alpha
17+
Development Status :: 3 - Alpha
1818
License :: OSI Approved :: BSD License
1919
Topic :: Scientific/Engineering :: Bio-Informatics
2020
Topic :: Software Development :: Libraries :: Application Frameworks
@@ -26,7 +26,8 @@
2626
Operating System :: MacOS :: MacOS X
2727
"""
2828

29-
long_description = """Qiita: Spot Patterns"""
29+
with open('README.rst') as f:
30+
long_description = f.read()
3031

3132
classifiers = [s.strip() for s in classes.split('\n') if s]
3233

@@ -43,7 +44,9 @@
4344
'qiita_db',
4445
'qiita_db/metadata_template/',
4546
'qiita_pet',
47+
'qiita_pet/uimodules',
4648
'qiita_pet/handlers',
49+
'qiita_pet/handlers/study_handlers',
4750
'qiita_ware'
4851
],
4952
package_data={'qiita_core': ['support_files/config_test.txt'],

0 commit comments

Comments
 (0)