Merge branch 'master' of git.embl.de:schorb/pyem

applications/clem_icy.py

@@ -137,7 +137,7 @@ workdir = os.getcwd()
 os.chdir('C:\Software\icy')
 icycmd = 'java -jar icy.jar -x plugins.tprovoost.scripteditor.main.ScriptEditorPlugin C:\Software\opener.js'
 
-os.system(icycmd +' '+ mm_fm['mapfile'] +' '+  mm_em['mergefile'] + os.path.splitext(mm_em['mapfile'])[1])
+os.system(icycmd +' '+ mm_fm['mapfile'] +' '+  mm_em['mergefile'])
 
 os.chdir(workdir)
 

setup.py

@@ -6,7 +6,7 @@ with open("readme.md", "r") as fh:
     long_description = fh.read()
 
 setup(name='py-EM',
-      version='20200622',
+      version='20200630',
       py_modules=['pyEM'],
       description='Tools to interact with Serial EM enabling automated transmission electron microscopy.',
       long_description=long_description,