fix errors

qiita-spots · Feb 13, 2017 · c8113ea · c8113ea
1 parent a3505c2
commit c8113ea
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/qiita_db/metadata_template/test/test_sample_template.py b/qiita_db/metadata_template/test/test_sample_template.py
@@ -2122,7 +2122,7 @@ def test_validate_errors_timestampA_year2digits(self):
             self.assertEqual(len(warn), 1)
             # the order might change so testing by elements
             self.assertItemsEqual(str(warn[0].message).split('\n'),
-                             exp_message.split('\n'))
+                                  exp_message.split('\n'))
 
     def test_validate_errors_timestampB_year4digits(self):
         self.metadata.set_value('Sample1', 'collection_timestamp',

diff --git a/qiita_db/support_files/patches/python_patches/51.py b/qiita_db/support_files/patches/python_patches/51.py
@@ -9,7 +9,6 @@
 from qiita_db.sql_connection import TRN
 
 
-
 # getting columns in each info file that we need to check for
 cols_sample = [col
                for key, vals in viewitems(SAMPLE_TEMPLATE_COLUMNS)
@@ -21,6 +20,7 @@
                  for key, vals in viewitems(PREP_TEMPLATE_COLUMNS_TARGET_GENE)
                  for col, dt in viewitems(vals.columns)])
 
+
 def transform_date(value):
     # for the way the patches are applied we need to have this import and
     # the next 2 variables within this function

diff --git a/qiita_pet/handlers/api_proxy/tests/test_sample_template.py b/qiita_pet/handlers/api_proxy/tests/test_sample_template.py
@@ -472,7 +472,6 @@ def test_sample_template_delete_req_no_template(self):
                                'exist' % self.new_study.id})
 
     def test_sample_template_filepaths_get_req(self):
-        templates_dir = qdb.util.get_mountpoint('templates')[0][1]
         obs = sample_template_filepaths_get_req(1, 'test@foo.bar')
         # have to check each key individually as the filepaths will change
         self.assertEqual(obs['status'], 'success')

diff --git a/qiita_pet/support_files/doc/source/tutorials/prepare-information-files.rst b/qiita_pet/support_files/doc/source/tutorials/prepare-information-files.rst
@@ -72,14 +72,14 @@ These are the columns required for successfully submit your data to EBI:
 +----------------------------------+-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+
 | Field name                       | Format                  | Description                                                                                                                                         |
 +==================================+=========================+=====================================================================================================================================================+
-| ``collection_timestamp``         | ``mm/dd/yyyy hh:mm:ss`` | The time stamp (preferred) of when the sample was collected. Several format are accepted.                                                           |
-|                                  | or ``mm/dd/yyyy hh:mm`` |                                                                                                                                                     |
-|                                  | or ``mm/dd/yyyy hh``    |                                                                                                                                                     |
-|                                  | or ``mm/dd/yyyy``       |                                                                                                                                                     |
-|                                  | or ``mm/yyyy``          |                                                                                                                                                     |
+| ``collection_timestamp``         | ``yyyy-mm-dd hh:mm:ss`` | The time stamp (preferred) of when the sample was collected. Several format are accepted, all ISO 8601.                                             |
+|                                  | or ``yyyy-mm-dd hh:mm`` |                                                                                                                                                     |
+|                                  | or ``yyyy-mm-dd hh``    |                                                                                                                                                     |
+|                                  | or ``yyyy-mm-dd ``      |                                                                                                                                                     |
+|                                  | or ``yyyy-mm``          |                                                                                                                                                     |
 |                                  | or ``yyyy``.            |                                                                                                                                                     |
-|                                  | Years are supported as  |                                                                                                                                                     |
-|                                  | 4 ``yyyy`` or 2 ``yy``  |                                                                                                                                                     |
+|                                  | Years are only          |                                                                                                                                                     |
+|                                  | supported as 4 ``yyyy`` |                                                                                                                                                     |
 |                                  | digits                  |                                                                                                                                                     |
 +----------------------------------+-------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+
 | ``physical_specimen_location``   | free text               | Where you would go to find physical sample or DNA, regardless of whether it is still available or not.                                              |