From: W. Trevor King <wking@tremily.us>
Date: Mon, 21 Oct 2013 16:36:38 +0000 (-0700)
Subject: swc-windows-installer.py: Remove IPython and nose entry points
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=94caead;p=swc-workshop.git

swc-windows-installer.py: Remove IPython and nose entry points

Ethan thought these had been fixed upstream, and Aron Ahmadia pointed
to the Anaconda v1.6.2 release notes [1]:

  2013-07-09: 1.6.2: (Windows only)

    Fixed path being incorrectly appended on Windows during install

That means we can drop our entry point scripts and fall back to just
installing Nano and setting up EDITOR.

[1]: http://docs.continuum.io/anaconda/changelog.html
---

diff --git a/setup/swc-windows-installer.py b/setup/swc-windows-installer.py
index af72639..88d5c75 100755
--- a/setup/swc-windows-installer.py
+++ b/setup/swc-windows-installer.py
@@ -5,8 +5,6 @@
 Helps mimic a *nix environment on Windows with as little work as possible.
 
 The script:
-* Provides standard ipython operation for msysgit
-* Provides standard nosetests behavior for msysgit
 * Installs nano and makes it accessible from msysgit
 
 To use:
@@ -44,30 +42,6 @@ def install_nano(install_directory):
     for file_name in nano_files:
         nano_zip.extract(file_name, install_directory)
 
-def create_ipython_entry_point(python_scripts_directory):
-    """Creates a terminal-based IPython entry point for msysgit"""
-    contents = '\n'.join([
-            '#!/usr/bin/env python',
-            'from IPython.frontend.terminal.ipapp import launch_new_instance',
-            'launch_new_instance()',
-            '',
-            ])
-    with open(os.path.join(python_scripts_directory, 'ipython'), 'w') as f:
-        f.write(contents)
-
-def create_nosetests_entry_point(python_scripts_directory):
-    """Creates a terminal-based nosetests entry point for msysgit"""
-    contents = '\n'.join([
-            '#!/usr/bin/env/ python',
-            'import sys',
-            'import nose',
-            "if __name__ == '__main__':",
-            '    sys.exit(nose.core.main())',
-            '',
-            ])
-    with open(os.path.join(python_scripts_directory, 'nosetests'), 'w') as f:
-        f.write(contents)
-
 
 def update_bash_profile(extra_paths=()):
     """Create or append to a .bash_profile for Software Carpentry
@@ -98,8 +72,6 @@ def main():
     home_dir = os.path.expanduser('~')
     nano_dir = os.path.join(home_dir, '.nano')
     bin_dir = os.path.join(home_dir, '.swc-bin')
-    create_ipython_entry_point(python_scripts_directory=bin_dir)
-    create_nosetests_entry_point(python_scripts_directory=bin_dir)
     install_nano(installation_directory=nano_dir)
     update_bash_profile(extra_paths=(bin_dir, nano_dir))