Skip to content

Commit 07324b3

Browse files
authored
2020.11 (#3048)
* changes after deploy for 2020.11 * fix test * addressing @ElDeveloper commenets * minor doc changes that we missed
1 parent 36faa57 commit 07324b3

File tree

14 files changed

+43
-21
lines changed

14 files changed

+43
-21
lines changed

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Qiita changelog
22

3+
4+
Version 2020.11
5+
---------------
6+
7+
* Deprecated the automatic creation of the per template QIIME1 mapping file. If you want to merge a preparation and a BIOM table you must first create a meta-analysis.
8+
* Added a new autoloaded boolean flag to the Study object so we can control if a study was autoloaded via an automatic EBI-ENA or SRA loading job.
9+
* We stopped adding the CRC32 information from mod_zip, which should remove the warnings about CRC incorrect checksums.
10+
* Removed the show/hide button from an analysis while the analysis was being built to avoid possible confusion.
11+
* A new per-sample, fast, bowtie2 and Woltka plugin for WGS and Metatrascriptomics processing has been added, deprecating the Shogun plugin and moving the rest of the commands to a new qp-meta plugin.
12+
* Added the possibility for plugins to submit and control their own jobs vs. Qiita automatically submitting for them. For specifics of this new functionality, visit (![#3040](https://github.com/biocore/qiita/pull/3040/files))
13+
* We increased the number of workers in qiita.ucsd.edu for the web interface (from eight to twenty), redbiom (from eight to ten), and the plugin interactions (from eight to twenty). This should speed up responses and improve general performance.
14+
* For the qp-qiime2 plugin, we removed some unsupported alpha rarefaction metrics from the options, following QIIME2 guidelines.
15+
* For the qp-qiime2 plugin, if the user selects a tree but it doesn't exist, it will not try to parse and skip it.
16+
317
Version 092020
418
--------------
519

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__ = "092020"
9+
__version__ = "2020.11"

qiita_db/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from . import user
2828
from . import processing_job
2929

30-
__version__ = "092020"
30+
__version__ = "2020.11"
3131

3232
__all__ = ["analysis", "artifact", "archive", "base", "commands",
3333
"environment_manager", "exceptions", "investigation", "logger",

qiita_pet/__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__ = "092020"
9+
__version__ = "2020.11"

qiita_pet/handlers/api_proxy/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from .user import (user_jobs_get_req)
3939
from .util import check_access, check_fp
4040

41-
__version__ = "092020"
41+
__version__ = "2020.11"
4242

4343
__all__ = ['prep_template_summary_get_req', 'data_types_get_req',
4444
'study_get_req', 'sample_template_filepaths_get_req',

qiita_pet/handlers/api_proxy/prep_template.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,18 +141,13 @@ def prep_template_ajax_get_req(user_id, prep_id):
141141
investigation_type = pt.investigation_type
142142

143143
download_prep_id = None
144-
download_qiime_id = None
145144
other_filepaths = []
146145
for fp_id, fp in pt.get_filepaths():
147146
fp = basename(fp)
148-
if 'qiime' in fp:
149-
if download_qiime_id is None:
150-
download_qiime_id = fp_id
147+
if download_prep_id is None:
148+
download_prep_id = fp_id
151149
else:
152-
if download_prep_id is None:
153-
download_prep_id = fp_id
154-
else:
155-
other_filepaths.append(fp)
150+
other_filepaths.append(fp)
156151

157152
ontology = _get_ENA_ontology()
158153

@@ -165,7 +160,6 @@ def prep_template_ajax_get_req(user_id, prep_id):
165160
'name': name,
166161
'files': files,
167162
'download_prep_id': download_prep_id,
168-
'download_qiime_id': download_qiime_id,
169163
'other_filepaths': other_filepaths,
170164
'num_samples': num_samples,
171165
'num_columns': num_columns,

qiita_pet/handlers/api_proxy/tests/test_prep_template.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,9 @@ def test_prep_template_ajax_get_req(self):
7474
'name': "Prep information 1",
7575
'files': ["uploaded_file.txt"],
7676
'download_prep_id': 24,
77-
'download_qiime_id': 21,
78-
'other_filepaths': ['1_prep_1_19700101-000000.txt',
77+
'other_filepaths': ['1_prep_1_qiime_19700101-000000.txt',
78+
'1_prep_1_19700101-000000.txt',
79+
'1_prep_1_qiime_19700101-000000.txt',
7980
'1_prep_1_19700101-000000.txt'],
8081
'num_samples': 27,
8182
'num_columns': 22,

qiita_pet/static/js/networkVue.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ Vue.component('processing-graph', {
352352
})
353353
.fail(function(object, status, error_msg) {
354354
bootstrapAlert("Error submitting workflow: " + object.statusText, "danger");
355-
});
355+
})
356356
.always(function() {
357357
// return button to regular state
358358
$('#run-btn').attr('disabled', false);

qiita_pet/support_files/doc/source/analyzingsamples/index.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Thanks to this, we've got new layout of the analysis panel and the following new
1212
* `Filter Samples <https://docs.qiime2.org/2020.2/plugins/available/feature-table/>`__
1313
* `Taxa Summary <https://docs.qiime2.org/2020.2/plugins/available/taxa/barplot/>`__ (example `here <https://view.qiime2.org/visualization/?type=html&src=https%3A%2F%2Fdocs.qiime2.org%2F2020.2%2Fdata%2Ftutorials%2Fmoving-pictures%2Ftaxa-bar-plots.qzv>`__)
1414

15+
16+
.. _creating_a_new_analysis:
17+
1518
Creating A New Analysis
1619
-----------------------
1720

qiita_pet/support_files/doc/source/faq.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,18 @@ etc; for more information check
244244
`this 3 minute read about Markdown <https://guides.github.com/features/mastering-markdown/>`__.
245245

246246

247+
Where's my QIIME1 mapping file?
248+
-------------------------------
249+
250+
During the 2020.11 deployment we removed the functionality that automatically created
251+
the merged preparation and sample information file per preparation. This change will allow us
252+
to make faster information file updates allow for future multi-site operations.
253+
254+
If you want to create a merged and validated mapping file (merged sample and preparation
255+
information file) please create an analysis by following these instructions:
256+
:ref:`creating_a_new_analysis`.
257+
258+
247259
I want to transfer a lot of files to Qiita, is there an easy way?
248260
-----------------------------------------------------------------
249261

0 commit comments

Comments
 (0)