Merge pull request #195 from scipion-em/devel

Fix config --overwrite: scipion.template (deleted) not needed.

CHANGES.txt

@@ -1,3 +1,5 @@
+V3.6.1
+ - Fix config --overwrite: scipion.template (deleted) not needed.
 V3.6.0
  - Template window shows browser icons
  - Template window adapted to use workflow hub templates

scipion/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '3.6.0'
+__version__ = '3.6.1'
 

scipion/install/plugin_funcs.py

@@ -10,7 +10,7 @@
 from pwem import Domain
 from pyworkflow.utils import redStr, yellowStr
 from pyworkflow.utils.path import cleanPath
-from pyworkflow import LAST_VERSION, CORE_VERSION, OLD_VERSIONS, Config
+from pyworkflow import LAST_VERSION, CORE_VERSION, Config
 from importlib import reload
 
 NULL_VERSION = "0.0.0"
@@ -30,8 +30,6 @@
 PIP_UNINSTALL_CMD = '{0} -m pip uninstall -y %s'.format(
     Environment.getPython())
 
-versions = list(OLD_VERSIONS) + [LAST_VERSION]
-
 
 class PluginInfo(object):
 

scipion/scripts/config.py

@@ -196,9 +196,6 @@ def createConf(fpath, ftemplate, unattended=False):
     print(yellow("* Creating configuration file: %s" % fpath))
     print("Please edit it to reflect the configuration of your system.\n")
 
-    if not os.path.exists(ftemplate):
-        raise FileNotFoundError('Missing file: %s' % ftemplate)
-
     # Special case for scipion config
     if getTemplateName(SCIPION_CONF) in ftemplate:
 
@@ -214,6 +211,9 @@ def createConf(fpath, ftemplate, unattended=False):
         # Create the actual configuration file.
         cf.write(open(fpath, 'w'))
     else:
+        if not os.path.exists(ftemplate):
+            raise FileNotFoundError('Missing file: %s' % ftemplate)
+
         # For host.conf and protocols.conf, just copy files
         copyfile(ftemplate, fpath)