Skip to content

Relaxing metadata requirements #1021

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
ee28b13
Adding patch
josenavas Mar 28, 2015
5c60e61
Fixing populate test db
josenavas Mar 28, 2015
39d2429
Fixing base objects
josenavas Mar 28, 2015
5cc71a0
New metadata template code layout
josenavas Mar 28, 2015
1b8dbdb
Improving base class and tests
josenavas Mar 28, 2015
2bc0117
Solving SampleTemplate creation issues
josenavas Mar 29, 2015
4212b04
Adding few files that I forgot on the previous commit
josenavas Mar 29, 2015
9b1b9d7
Fixing the sample template class
josenavas Mar 29, 2015
ad1948f
Moving read only tests to their own class
josenavas Mar 29, 2015
09eca70
Moving some code to the base class
josenavas Mar 29, 2015
cc2be6b
Fixing tests for PrepSample
josenavas Mar 29, 2015
1a2c955
Fixing all prep template tests
josenavas Mar 29, 2015
2ce7f65
Fixing pep8
josenavas Mar 29, 2015
6c728c8
Adding utilities
josenavas Mar 30, 2015
03be340
Moving db read only tests to its own class
josenavas Mar 30, 2015
af5f5de
Creating constants module for holding metadata constants
josenavas Mar 30, 2015
a67a71c
Adding squirrelo's code
josenavas Mar 30, 2015
7254b68
Removing unneeded files
josenavas Mar 30, 2015
fd7608a
Fixing bug on delete and reducing code duplication
josenavas Mar 30, 2015
4260c39
Adding column checker
josenavas Mar 31, 2015
8c3d32e
linkerprimersequnce->primer & barcodesequence->barcode
josenavas Mar 31, 2015
d3fedea
Add datatype specific column checking
josenavas Mar 31, 2015
47aac33
reducing code duplication
josenavas Mar 31, 2015
d3fe0ac
Reducing code duplicatio on object creation
josenavas Mar 31, 2015
6402e10
Adding comments
josenavas Mar 31, 2015
91e67ef
constants.py -> column_restriction.py
josenavas Mar 31, 2015
336f470
Enforcing lowercasing when loading templates
josenavas Mar 31, 2015
58422b8
Fixing search tests
josenavas Mar 31, 2015
ab0c7ae
Exposing needed functions
josenavas Mar 31, 2015
879d53f
Fixing setup tests
josenavas Mar 31, 2015
71b08f5
Fixing util tests
josenavas Mar 31, 2015
b091863
Removing functions that are no longer needed
josenavas Mar 31, 2015
a4cc4ab
Simplifying to_file function
josenavas Mar 31, 2015
8711478
Adding missing prep template to the repo and to the database + fix al…
josenavas Apr 1, 2015
29ef682
Forgot the tests for the job object
josenavas Apr 1, 2015
242293d
Fixing analysis object...
josenavas Apr 1, 2015
9d61f9a
Adding metadata_template to setup.py
josenavas Apr 1, 2015
e443d30
Adding qiime_map_fp property to prep template
josenavas Apr 1, 2015
b4462ca
Adding regenerate files function to prep template
josenavas Apr 1, 2015
bb2193e
Fixing bug in prep template creation
josenavas Apr 1, 2015
8e8de2a
Fixing qiita_ware for requirement changes
josenavas Apr 1, 2015
c9eb332
Fixing one remaining test
josenavas Apr 1, 2015
4a0d797
Adding check_restrictions func to base metadata template
josenavas Apr 1, 2015
9af44f6
exposing all the needed things
josenavas Apr 1, 2015
944818a
Disabling ebi submission if missing columns
josenavas Apr 1, 2015
2084f39
Disabling preprocessing and processed data approval based on missing …
josenavas Apr 1, 2015
3d0687e
Updating dbs and html files
josenavas Apr 1, 2015
3a1aef4
Merge branch 'master' of github.com:qiime/QiiTa into relaxing-metadat…
josenavas Apr 1, 2015
303a747
Addressing @squirrelo's comment
josenavas Apr 1, 2015
7d81c2c
Adding missing comma that was breaking flake8 but not the code?
josenavas Apr 1, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
exposing all the needed things
  • Loading branch information
josenavas committed Apr 1, 2015
commit 9af44f660a750a42bad669cc555b1bcc4ce438fc
7 changes: 5 additions & 2 deletions qiita_db/metadata_template/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
from .sample_template import SampleTemplate
from .prep_template import PrepTemplate
from .util import load_template_to_dataframe
from .column_restriction import TARGET_GENE_DATA_TYPES
from .column_restriction import (TARGET_GENE_DATA_TYPES, PREP_TEMPLATE_COLUMNS,
SAMPLE_TEMPLATE_COLUMNS,
PREP_TEMPLATE_COLUMNS_TARGET_GENE)

__version__ = "0.0.1-dev"

__all__ = ['SampleTemplate', 'PrepTemplate', 'load_template_to_dataframe'
'TARGET_GENE_DATA_TYPES']
'TARGET_GENE_DATA_TYPES', 'SAMPLE_TEMPLATE_COLUMNS',
'PREP_TEMPLATE_COLUMNS_TARGET_GENE', 'PREP_TEMPLATE_COLUMNS']
4 changes: 1 addition & 3 deletions qiita_db/metadata_template/base_metadata_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -1007,8 +1007,6 @@ def check_restrictions(self, restrictions):

Returns
-------
bool
A boolean indicating whether the restrictions have been fulfilled
list of str
The list of missing columns
"""
Expand All @@ -1018,4 +1016,4 @@ def _col_iter():
yield col
categories = self.categories()
missing = [col for col in _col_iter() if col not in categories]
return len(missing) == 0, missing
return missing
3 changes: 1 addition & 2 deletions qiita_db/metadata_template/test/test_sample_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -700,9 +700,8 @@ def test_categories(self):
self.assertEqual(obs, exp)

def test_check_restrictions(self):
obs_bool, obs_list = self.tester.check_restrictions(
obs_list = self.tester.check_restrictions(
[SAMPLE_TEMPLATE_COLUMNS['EBI']])
self.assertEqual(obs_bool, True)
self.assertEqual(obs_list, [])


Expand Down