Merge pull request #217 from JustasB/dev

Travis fix

neuronunit/models/backends/base.py

@@ -20,22 +20,8 @@
 from sciunit.utils import dict_hash, import_module_from_path, \
                           TemporaryDirectory
 
-try:
-    # Never import neuron in the current directory, or it will automatically
-    # load mechanisms in that directory, which will then cause future calls
-    # to load_mechanisms() to fail due to already loaded mechanisms.
-    temp = TemporaryDirectory()
-    curr = os.getcwd()
-    os.chdir(temp.name)
-    import neuron
-    from neuron import h
-    NEURON_SUPPORT = True
-    os.chdir(curr)
-    temp.cleanup()
-except:
-    neuron = None
-    h = None
-    NEURON_SUPPORT = False
+# Test for NEURON support in a separate python process
+NEURON_SUPPORT = (os.system("python -c 'import neuron' > /dev/null 2>&1") == 0)  
 
 try:
     import pyNN

neuronunit/models/lems.py

@@ -5,7 +5,7 @@
 try:
     from urllib.parse import urljoin
 except ImportError:
-    from urllib import urljoin
+    from urlparse import urljoin
 
 import requests
 import validators