Merge pull request #499 from Deborah-Digges/remove-gui

Issue 441: Remove the GUI and all references

README.md

@@ -25,7 +25,6 @@ Installing From Source
 
 To install the EcoData Retriever from source, you'll need Python 2.6+ with the following packages installed:
 
-* wxPython
 * xlrd
 
 ###The following packages are optional
@@ -50,14 +49,13 @@ After installing, run `retriever update` to download all of the available datase
 To see the full list of command line options and datasets run `retriever --help`.
 The output will look like this:
 ```
-usage: retriever [-h] [-v] [-q] {install,update,gui,new,ls,citation,help} ...
+usage: retriever [-h] [-v] [-q] {install,update,new,ls,citation,help} ...
 
 positional arguments:
-  {install,update,gui,new,ls,citation,help}
+  {install,update,new,ls,citation,help}
                         sub-command help
     install             download and install dataset
     update              download updated versions of scripts
-    gui                 launch retriever in graphical mode
     new                 create a new sample retriever script
     ls                  display a list all available dataset scripts
     citation            view citation

__init__.py

@@ -54,14 +54,7 @@
 DATA_WRITE_PATH = DATA_SEARCH_PATHS[-1]
 
 # Create default data directory
-isgui = len(sys.argv) == 1 or ((len(sys.argv) > 1 and sys.argv[1] == 'gui'))
-if current_platform == 'windows' and isgui:
-    # The run path for installer based GUI on Windows is a system path.
-    # Users won't expect the data to be stored there, so store it on the
-    # Desktop
-    DATA_DIR = os.path.join(os.path.expanduser('~'), 'Desktop')
-else:
-    DATA_DIR = '.'
+DATA_DIR = '.'
 
 
 def MODULE_LIST(force_compile=False):

__main__.py

@@ -25,14 +25,9 @@
 
 def main():
     """This function launches the EcoData Retriever."""
-    if len(sys.argv) == 1 or (len(sys.argv) > 1 and sys.argv[1] == 'gui'):
-        # if no command line args are passed, launch GUI
-
-        check_for_updates(graphical=False if current_platform == 'darwin' else True)
-        lists = get_lists()
-
-        from retriever.app.main import launch_app
-        launch_app(lists)
+    if len(sys.argv) == 1:
+        # if no command line args are passed, show the help options
+        parser.parse_args(['-h'])
 
     else:
         # otherwise, parse them
@@ -50,7 +45,7 @@ def main():
             script_list = SCRIPT_LIST(force_compile=True)
 
         if args.command == 'update':
-            check_for_updates(graphical=False)
+            check_for_updates()
             script_list = SCRIPT_LIST()
             return
 
@@ -69,13 +64,6 @@ def main():
 
             return
 
-        elif args.command == 'gui':
-            lists = get_lists()
-
-            from retriever.app.main import launch_app
-            launch_app(lists)
-            return
-
         elif args.command == 'new':
             f = open(args.filename, 'w')
             f.write(sample_script)
@@ -92,7 +80,7 @@ def main():
             # If scripts have never been downloaded there is nothing to list
             if not script_list:
                 print "No scripts are currently available. Updating scripts now..."
-                check_for_updates(graphical=False)
+                check_for_updates()
                 print "\n\nScripts downloaded.\n"
                 script_list = SCRIPT_LIST()