Install required dependencies from requirements.txt rather than

convoluted galaxy.wheels method. Not sure why I was doing that.
Hackathons are dangerous places.

lib/galaxy/wheels.py

@@ -3,31 +3,17 @@
 
 import sys
 
-from os import pardir
-from os.path import abspath, join, dirname
-
 try:
     import configparser
 except:
     import ConfigParser as configparser
 
 
-BASE_REQUIREMENTS = []
 OPTIONAL_REQUIREMENTS = (
     'pysqlite',
     'psycopg2',
 )
 
-for line in open(join(abspath(dirname(__file__)), pardir, pardir, 'requirements.txt')):
-    line = line.strip()
-    try:
-        line = line.split()[0]
-    except:
-        continue
-    if line.startswith( '#' ) or line == '':
-        continue
-    BASE_REQUIREMENTS.append( line )
-
 
 class GalaxyConfig( object ):
     def __init__( self, config_file ):
@@ -57,12 +43,6 @@ def check( self, name ):
                 return False
 
 
-def requirements( config_file ):
+def optional( config_file ):
     config = GalaxyConfig( config_file )
-    rval = list(BASE_REQUIREMENTS)
-
-    for opt in OPTIONAL_REQUIREMENTS:
-        if config.check(opt):
-            rval.append( opt )
-
-    return rval
+    return [ opt for opt in OPTIONAL_REQUIREMENTS if config.check( opt ) ]

scripts/common_startup.sh

@@ -95,5 +95,6 @@ fi
 
 if [ $FETCH_WHEELS -eq 1 ]; then
     pip install -e git+https://github.com/natefoo/pip@linux-wheels#egg=pip
-    PYTHONPATH=lib python -c "import galaxy.wheels; print '\n'.join(galaxy.wheels.requirements('$GALAXY_CONFIG_FILE'))" | pip install -r /dev/stdin --index-url https://wheels.galaxyproject.org/simple/
+    pip install -r requirements.txt --index-url https://wheels.galaxyproject.org/simple/
+    PYTHONPATH=lib python -c "import galaxy.wheels; print '\n'.join(galaxy.wheels.optional('$GALAXY_CONFIG_FILE'))" | pip install -r /dev/stdin --index-url https://wheels.galaxyproject.org/simple/
 fi