cleanup files before transfering

sdpython · Mar 12, 2019 · ba391f9 · ba391f9
1 parent 0ec7710
commit ba391f9
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/_doc/examples/automation/fetch_student_projects_from_gmail.py b/_doc/examples/automation/fetch_student_projects_from_gmail.py
@@ -44,11 +44,11 @@
 
 server = "imap.gmail.com"
 school = "ENSAE"
-date = "25-Jan-2019"
-pattern = "Python_{0}_TD_2A_2019"
+date = "8-Feb-2019"
+pattern = "Python_{0}_TD_3A_master_2019"
 group_def = "groupes.xlsx"
 col_subject, col_group, col_mail, col_student = "sujet", "groupe", "mail", "Nom"
-final_dest = ["2018-2019", "3A_projet"]
+final_dest = ["2018-2019", "3A_projet_master"]
 
 
 if school == 'ENSAE':

diff --git a/_unittests/ut_documentation/test_LONG_notebooks_bug_html.py b/_unittests/ut_documentation/test_LONG_notebooks_bug_html.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 from pyquickhelper.loghelper import fLOG
-from pyquickhelper.helpgen import process_notebooks
+from pyquickhelper.helpgen.process_notebooks import process_notebooks
 from pyquickhelper.pycode import get_temp_folder
 
 try:

diff --git a/_unittests/ut_documentation/test_LONG_notebooks_bug_latex.py b/_unittests/ut_documentation/test_LONG_notebooks_bug_latex.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 from pyquickhelper.loghelper import fLOG
-from pyquickhelper.helpgen import process_notebooks
+from pyquickhelper.helpgen.process_notebooks import process_notebooks
 from pyquickhelper.pycode import get_temp_folder
 
 try:

diff --git a/_unittests/ut_documentation/test_LONG_notebooks_bug_latex2.py b/_unittests/ut_documentation/test_LONG_notebooks_bug_latex2.py
@@ -6,7 +6,7 @@
 import os
 import unittest
 from pyquickhelper.loghelper import fLOG
-from pyquickhelper.helpgen import process_notebooks
+from pyquickhelper.helpgen.process_notebooks import process_notebooks
 from pyquickhelper.pycode import get_temp_folder
 
 try:

diff --git a/_unittests/ut_module/test_notebooks_bug_latex1.py b/_unittests/ut_module/test_notebooks_bug_latex1.py
@@ -9,7 +9,7 @@
 import warnings
 from pyquickhelper.loghelper import fLOG
 from pyquickhelper.pycode import get_temp_folder, is_travis_or_appveyor
-from pyquickhelper.helpgen import process_notebooks
+from pyquickhelper.helpgen.process_notebooks import process_notebooks
 
 try:
     import src

diff --git a/src/ensae_teaching_cs/automation/ftp_publish_helper.py b/src/ensae_teaching_cs/automation/ftp_publish_helper.py
@@ -22,7 +22,8 @@ def trigger_on_specific_strings(content, filename=None, force_allow=None):
     @param      force_allow allow these expressions even if they seem to be credentials
     @return                 modified content
     """
-    strep = []
+    strep = [('/var/lib/jenkins/workspace/_automation/_automation_FORK_', 'somewhere'),
+             ('/var/lib/jenkins', 'somewhere')]
     for env in ['USERNAME', 'USER']:
         if env in os.environ and os.environ[env] != "jenkins":
             for sub in ["_data", "GitHub"]:
@@ -384,12 +385,16 @@ def _update_path(pth):
         for proj in additional_projects:
             if 'root_local' not in proj:
                 if 'folder' not in proj:
-                    raise KeyError("Keys 'folder' or 'root_local' must be specified in {}.".format(proj))
+                    raise KeyError(
+                        "Key 'folder' or 'root_local' must be specified in {}.".format(proj))
                 proj = proj.copy()
                 proj['root_local'] = proj['folder']
             if 'folder' not in proj:
                 proj = proj.copy()
                 proj['folder'] = proj['root_local']
+            if 'local' not in proj:
+                proj = proj.copy()
+                proj['local'] = os.path.dirname(proj['root_local'])
             projects.append(proj)
 
     if transfer: