formatting updates

Author: Hecatron

conda/web-installer/build.py

@@ -5,54 +5,57 @@
 
 
 def usage():
-    print('Web installer build script')
-    print('build.py <installer version> <tag version>')
-    print('The installer verison is the version number used within the conda constructor script')
-    print('The tag verison is the version of cadquery that will be pulled from github')
+    print("Web installer build script")
+    print("build.py <installer version> <tag version>")
+    print(
+        "The installer verison is the version number used within the conda constructor script"
+    )
+    print("The tag verison is the version of cadquery that will be pulled from github")
+
 
 def write_file(destpath, contents):
-        with open(destpath, "w") as destfile:
-            destfile.write(contents)    
+    with open(destpath, "w") as destfile:
+        destfile.write(contents)    
+
 
 def run_cmd(cmdarray, workingdir, captureout=False):
     stdout = stderr = None
     if captureout:
         stdout = stderr = subprocess.PIPE
-    proc = subprocess.Popen(cmdarray, cwd=workingdir, stdout=stdout, stderr=stderr, universal_newlines=True)
+    proc = subprocess.Popen(
+        cmdarray, cwd=workingdir, stdout=stdout, stderr=stderr, universal_newlines=True
+    )
     proc_out, proc_err = proc.communicate()
     if proc.returncode != 0:
-        raise RuntimeError('Failure to run command')
+        raise RuntimeError("Failure to run command")
     return stdout, stderr
 
+
 def generate_templates(installer_version, tag_version):
-    print('Generating Scripts')
-    env = Environment(
-        loader=FileSystemLoader("."),
-        autoescape=select_autoescape()
-    )
+    print("Generating Scripts")
+    env = Environment(loader=FileSystemLoader("."), autoescape=select_autoescape())
 
     template = env.get_template("construct.yaml.jinja2")
     output = template.render(installer_version=installer_version)
-    write_file('construct.yaml', output)
+    write_file("construct.yaml", output)
 
     template = env.get_template("post-install.bat.jinja2")
     output = template.render(tag_version=tag_version)
-    write_file('post-install.bat', output)
+    write_file("post-install.bat", output)
 
     template = env.get_template("post-install.sh.jinja2")
     output = template.render(tag_version=tag_version)
-    write_file('post-install.sh', output)
+    write_file("post-install.sh", output)
 
 
 def run_constructor():
-    print('Running constructor')
+    print("Running constructor")
     scriptdir = os.path.dirname(os.path.realpath(__file__))
     builddir = os.path.join(scriptdir, 'build')
     if not os.path.exists(builddir):
         os.makedirs(builddir)
     run_cmd(['constructor', scriptdir], builddir)
 
-    # TODO
 
 def main():
     if len(sys.argv) < 2:
@@ -63,4 +66,5 @@ def main():
     generate_templates(installer_version, tag_version)
     run_constructor()
 
+
 main()

conda/web-installer/post-install.bat.jinja2

@@ -2,7 +2,7 @@ echo Entering Conda Environment
 call %PREFIX%\condabin\activate.bat
 
 echo Updating conda
-call conda update -y -n base conda
+call conda update -q conda
 
 echo Cleaning Packages
 call conda clean -a -y

conda/web-installer/post-install.sh.jinja2

@@ -4,7 +4,7 @@ echo Entering Conda Environment
 source $PREFIX/bin/activate
 
 echo Updating conda
-conda update -y -n base conda
+conda update -q conda
 
 echo Cleaning Packages
 conda clean -a -y