Merge tag 'v1.1' into develop

sort and archive workspaces methods and cl-utils added

docs/source/_api/conf.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # tastic documentation build configuration file, created by
-# sphinx-quickstart on Wed Nov  9 14:48:48 2016.
+# sphinx-quickstart on Wed Nov  9 22:23:08 2016.
 #
 # This file is execfile()d with the current directory set to its
 # containing dir.

docs/source/_api/index.rst

@@ -1,5 +1,5 @@
 .. tastic documentation master file, created by
-   sphinx-quickstart on Wed Nov  9 14:48:48 2016.
+   sphinx-quickstart on Wed Nov  9 22:23:08 2016.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 

tastic/__version__.py

@@ -1 +1 @@
-__version__ = '1.0.3'
+__version__ = '1.1'

tastic/tastic.py

@@ -29,6 +29,8 @@ class baseClass():
 
     def __init__(self, matchObject, parentObject=None):
         self.meta = matchObject
+        if self.meta["content"] == None:
+            self.meta["content"] = ""
         self.parent = parentObject
 
     @property
@@ -69,7 +71,7 @@ def projects(self):
         """
         return self._get_object(
             regex=re.compile(
-                r'((?<=\n)|(?<=^))(?P<title>(?!\[Searches\]|- )\S.*?:(?!\S)) *(?P<tagString>( *?@[^(\s]+(\([^)]*\))?)+)?(?P<content>(\n(( |\t)+\S.*)|\n( |\t)*)+)', re.UNICODE),
+                r'((?<=\n)|(?<=^))(?P<title>(?!\[Searches\]|- )\S.*?:(?!\S)) *(?P<tagString>( *?@[^(\s]+(\([^)]*\))?)+)?(?P<content>(\n(( |\t)+\S.*)|\n( |\t)*)+)?', re.UNICODE),
             objectType="project",
             content=None
         )
@@ -796,7 +798,7 @@ def add_project(
 
         newProject = self._get_object(
             regex=re.compile(
-                r'((?<=\n)|(?<=^))(?P<title>(?!\[Searches\]|- )\S.*?:(?!\S)) *(?P<tagString>( *?@[^(\s]+(\([^)]*\))?)+)?(?P<content>(\n(( |\t)+\S.*)|\n( |\t)*)+)', re.UNICODE),
+                r'((?<=\n)|(?<=^))(?P<title>(?!\[Searches\]|- )\S.*?:(?!\S)) *(?P<tagString>( *?@[^(\s]+(\([^)]*\))?)+)?(?P<content>(\n(( |\t)+\S.*)|\n( |\t)*)*)', re.UNICODE),
             objectType="project",
             content=project
         )
@@ -808,7 +810,7 @@ def add_project(
             indentLevel=1, projects=self.projects + newProject)
 
         if self.parent:
-            self.parent._update_document_tree(
+            doc = self.parent._update_document_tree(
                 oldContent=oldContent,
                 newContent=newContent
             )
@@ -1073,14 +1075,15 @@ def add_task(
             indentLevel=1, tasks=self.tasks + newTask)
 
         if self.parent:
-            self.parent._update_document_tree(
+            doc = self.parent._update_document_tree(
                 oldContent=oldContent,
                 newContent=newContent
             )
 
         self.content = self.content.replace(self.to_string(indentLevel=0, title=False), self.to_string(
             indentLevel=0, title=False, tasks=self.tasks + newTask))
 
+        print self.parent
         doc = self
         while doc.parent:
             doc = doc.parent
@@ -1089,9 +1092,12 @@ def add_task(
         if not self.parent:
             parent = self
         else:
+
             parent = doc.get_project(self.title)
         if not parent:
             parent = doc.get_task(self.title)
+
+        print parent
         thisTask = parent.get_task(title)
 
         self.refresh
@@ -1455,10 +1461,12 @@ def delete(
         """
 
         projectTitle = self.title
-        for p in self.parent.projects:
+        theseProjects = self.parent.projects[:]
+        for p in theseProjects:
             if p.title == projectTitle:
-                self.parent.projects.remove(p)
+                theseProjects.remove(p)
                 break
+        self.parent.projects = theseProjects
 
         doc = self
         while doc:

tastic/tests/test_tutorial.py

@@ -70,13 +70,14 @@ def test_doc_function(self):
         doc.sort_projects("@due, @flag, @hold, @next, @someday, @wait")
         doc.save()
 
-        gardenProject.refresh
+        # gardenProject.refresh
 
         # ADD A NEW PROJECT
         shedProject = gardenProject.add_project(
             title="build a shed",
             tags="@someday @garden"
         )
+        gardenProject.refresh
 
         researchShedProject = shedProject.add_project(
             title="research shed designs",
@@ -104,6 +105,7 @@ def test_doc_function(self):
         for t in coffee.tasks:
             t.done("all")
 
+        print ""
         aTask = researchShedProject.add_task(
             "look for 5 videos on youtube", "@online")
 

tastic/workspace/tests/output/astronotes-wiki/projects/@due/PESSTO-ESO-SSDR3/PESSTO-ESO-SSDR3.taskpaper

@@ -4,33 +4,48 @@
 PESSTO-ESO-SSDR3: @due(3)
 Send Final Reduced Release to WiseRep: @flag
 	See here for details about last releases Wiserep export: airmail://message?mail=david.young%40pessto.org&messageid=CAEHLACpONudE6PLrPWRUVg%2BQpghVSDptZ%2Bmgo30YrjY5TxByrw%40mail.gmail.com
+	See here for details about last releases Wiserep export:
+	See here for details about last releases Wiserep export:
+	See here for details about last releases Wiserep export:
+	See here for details about last releases Wiserep export:
+	See here for details about last releases Wiserep export:
 Checklist: @wait
 	- copy cosimo and errki github log notes to my wiki @hold
 	- lock rows when a release has been submitted to stop file updates
 	- walk through my wiki notes, tidy up, add links and add to sql script to clean data
 	- add the EFFRON fix command to cron scripts
 Transient-Catalogue:
 	./transient-catalogue.md
+	Database Table:
+	PESSTO Classified Sources:
+		find: ^(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*$
+		replace: update phase_iii_transient_catalogue_ssdr3 set atel_ra = "\2", atel_dec="\3", atel_discovery_date="\4", atel_discovery_survey="\5", atel_discovery_mag=\6, atel_transient_redshift=\7, atel_classification="\8", atel_classification_phase="\9" where TRANSIENT_ID = "\1";
+		- parse the following from the atels source name, notes, classification phase days, classification date, disc date, trans redshift, classification type
+		- use the table to query and compare atel to marshall values   update marshall where needed @flag
+		find:
+		replace:
+		find:
+		replace:
+		find:
+		replace:
+		find:
+		replace:
+		find:
+		replace:
+	Non-PESSTO Classified Sources: @wait
+		- same task as for PESSTO classified sources
+		- check all atel text for source where TRANS CLASS SOURCE =atel to make sure the classification has come from that atel
 	ATel Matching: @due
 		- read through all Atels and make sure 
 			- the best classification is given
 			- the best phase estimate is given (qualitative and quantitative)
 	Host Matches: @flag
 		- for each transient do the following staged searches until a host is found - remember to record spec redshift or photoz and the stage at which the host is found
-			- 2.  NED Unclassified Extragalactic Candidates with 25" search radius @due
-			- 5.  NED Classified Extragalactic Source with a 100" search radius @wait
 			- 1.  NED Classified Extragalactic Source with 25" search radius
+			- 2.  NED Unclassified Extragalactic Candidates with 25" search radius @due
 			- 3.  SDSS DR12 Spectroscopic Sources with 25" search radius
 			- 4.  SDSS DR12 Photometric Sources with a 25" search radius
-	Non-PESSTO Classified Sources: @wait
-		- same task as for PESSTO classified sources
-		- check all atel text for source where TRANS CLASS SOURCE =atel to make sure the classification has come from that atel
-	Database Table:
-	PESSTO Classified Sources:
-		find: ^(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*\|\s*(.*?)\s*$
-		replace: update phase_iii_transient_catalogue_ssdr3 set atel_ra = "\2", atel_dec="\3", atel_discovery_date="\4", atel_discovery_survey="\5", atel_discovery_mag=\6, atel_transient_redshift=\7, atel_classification="\8", atel_classification_phase="\9" where TRANSIENT_ID = "\1";
-		- use the table to query and compare atel to marshall values   update marshall where needed @flag
-		- parse the following from the atels source name, notes, classification phase days, classification date, disc date, trans redshift, classification type
+			- 5.  NED Classified Extragalactic Source with a 100" search radius @wait
 Release Description:
 New PhaseIII Changes:
 	- Definition of catalogue data links. The keywords TXP3Ri and TXP3Ci, which were previously used to define the target catalogue of a data link between two catalogues, are being replaced by the new TXRGFi keyword. TXRGFi (type character string) should declare the filename of the target catalog in terms of the ORIGFILE name