Skip to content

Release candidate #2298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 120 commits into from
Sep 19, 2017
Merged

Release candidate #2298

merged 120 commits into from
Sep 19, 2017

Conversation

josenavas
Copy link
Contributor

No description provided.

josenavas and others added 30 commits August 23, 2017 07:05
@josenavas
Merge pull request #2249 from biocore/release-candidate
6080742 
[DO NOT MERGE] August 24th Release
@antgonza
replace printable for try/except utf-8
52e98a5
@antgonza
add sleeps for tests
e367b54
@antgonza
moving wait_for_prep_information_job
5f7177e
@antgonza
just leaving the changes on this pr
01da18f
@josenavas
Fixing tests
2ae9511
@josenavas
Reverting changes
2026d0c
@antgonza
dist: precise
f098fcf
@antgonza
Merge branch 'printable-to-utf8' of https://github.com/antgonza/qiita …
97a8397 
…into printable-to-utf8
@antgonza
addressing @josenavas comments
e195e07
@josenavas
Merge pull request #2255 from antgonza/printable-to-utf8
ef4f566 
replace printable for try/except utf-8
@josenavas
fix-2212
7d5da5c
@josenavas @ElDeveloper
Adding branch description to Contributing (#2256)
21f0287 
* Adding branch description

* Adding spaces

* Adding timeline
@josenavas
Merge branch 'dev' of https://github.com/biocore/qiita into dev
2e102b4
@antgonza
upgrading software
de5c89f
@antgonza
mv r_client to qiita
6248208
@antgonza
from redis import Redis
eb19870
@josenavas
Merge pull request #2261 from antgonza/upgrading-software
120e9ac 
upgrading software
@antgonza
Merge branch 'remove-moi' of https://github.com/biocore/qiita into r_…
58e2dab 
…client-to-qiita
@josenavas
Merge pull request #2262 from antgonza/r_client-to-qiita
8b4ce80 
r_client to qiita
@antgonza
rm moi and ipython
fa7cf3d
@josenavas
Move qiita_db/private.py -> qiita_ware/private_plugin.py
a47c13b
@antgonza
_system_call as system_call
c8c1b59
@antgonza
flake8
c46c05f
@antgonza
rm create_raw_data
f7e9b1e
@josenavas
Transferring VAMPS submission to internal job
c16b177
@antgonza
rm other unnecessary files
4de94cd
@antgonza
addressing @josenavas comment
f50dc35
@josenavas
Merge pull request #2263 from antgonza/rm-moi-ipython
d4f8d8c 
rm moi and ipython
@antgonza
Merge branch 'remove-moi' of https://github.com/biocore/qiita into rm…
925a3a5 
…-create_raw_data
josenavas and others added 27 commits September 15, 2017 11:11
@josenavas
Merge pull request #2287 from antgonza/fix-2258
a9aa1c4 
fix #2258
@antgonza
redbiom now adds per sample studies to analysis
d4cc989
@antgonza
Merge branch 'jobs-list-as-modal' of https://github.com/ElDeveloper/q…
525102e 
…iita into jobs-list-as-modal
@antgonza
jobs-list-as-modal
7906727
@antgonza
addresssing @josenavas comments
de75346
@antgonza
rm () from update_processing_job_data
b8e3da4
@antgonza
add prints to review errors
46b174e
@antgonza
rm prints
38e5cd7
@josenavas
Merge pull request #2289 from antgonza/jobs-list-as-modal
91f0051 
Jobs list as modal
@josenavas
Merge pull request #2288 from antgonza/redbiom-per-sample
ae3dc0c 
redbiom now adds per sample studies to analysis
@josenavas @antgonza
Fix 2190 (#2292)
c9045ff 
* Adding patch to add the 'name' parameter to all validate commands

* Adding the parameter 'name' automatically and adding a test for it

* Removing extra blank line

* Adding dflt value to artifact name

* Edited the wrong file

* Adding user defined name at creation time

* Fixing test
@antgonza @ElDeveloper
add is_from_analysis to artifact_handlers (#2293)
15b849f 
* add is_from_analysis to artifact_handlers

* fix test_post_metadata

* fix error
@antgonza
WIP: rm sudo from travis
81bd7b3
@antgonza
adding sed for config file
191199c
@antgonza
fix sed
53579aa
@antgonza
rm &
d12ed87
@antgonza
cat redis.conf
ea5d647
@antgonza
using local redis.conf
4c40d83
@antgonza
# protected-mode yes
fad8935
@antgonza
# supervised no
91bdbbc
@antgonza
redis-server --port 7777 &
e0d83bc
@antgonza @ElDeveloper
Fix 1293 (#2291)
1b7e38c 
* fix #1293

* flake8

* fix errors

* addressing @ElDeveloper comments
@antgonza
rm redis.conf
6adf8b1
@antgonza
fix awaiting_approval list bug
20226ed
@josenavas
Merge pull request #2295 from antgonza/rm-sudo
d5ecf8a 
rm sudo
@josenavas
Merge pull request #2296 from antgonza/awaiting_approval-list
33054b2 
fix awaiting_approval list bug
@josenavas @antgonza
Fix #2276 (#2294)
064d35a 
* Fix #2276

* Factoring out generate nginx directory file list

* Factoring out the nginx file list writing

* Factoring out generating the file list of an artifact

* Factoring out the header setting

* Addressing @antgonza's comment

* Addressing @wasade's comments
@antgonza antgonza merged commit 1e40145 into release-candidate Sep 19, 2017
@codecov-io
Copy link

codecov-io commented Sep 19, 2017 •
edited
Loading

Codecov Report

Merging #2298 into release-candidate will increase coverage by 0.94%.
The diff coverage is 89.49%.

Impacted file tree graph

@@                  Coverage Diff                  @@
##           release-candidate    #2298      +/-   ##
=====================================================
+ Coverage              92.81%   93.76%   +0.94%     
=====================================================
  Files                    171      163       -8     
  Lines                  18925    18550     -375     
=====================================================
- Hits                   17566    17393     -173     
+ Misses                  1359     1157     -202
Impacted Files Coverage Δ
qiita_db/__init__.py 100% <ø> (ø) ⬆️
qiita_db/test/test_artifact.py 99.84% <ø> (ø) ⬆️
qiita_db/commands.py 96.55% <ø> (-0.48%) ⬇️
...ita_pet/handlers/study_handlers/tests/test_base.py 98.14% <ø> (-0.22%) ⬇️
qiita_db/test/test_commands.py 99.6% <ø> (+0.28%) ⬆️
qiita_pet/test/test_prep_template.py 97.87% <ø> (ø) ⬆️
qiita_db/handlers/tests/test_oauth2.py 99.34% <100%> (ø) ⬆️
qiita_pet/test/tornado_test_base.py 91.22% <100%> (+0.31%) ⬆️
qiita_db/test/test_study.py 99.76% <100%> (ø) ⬆️
qiita_db/handlers/processing_job.py 96.92% <100%> (+7.06%) ⬆️
... and 57 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7941067...064d35a. Read the comment docs.

antgonza pushed a commit that referenced this pull request Sep 27, 2017
@josenavas @antgonza
[DO NOT MERGE] Release candidate (#2298) (#2299)
5b54aa7 
Release candidate (#2298)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@josenavas @codecov-io @antgonza @adswafford @ElDeveloper