Merge pull request #139 from joakim-hove/python3-conda-fix

Use fixed version for miniconda + Python3
equinor · Sep 24, 2018 · a69118a · a69118a
2 parents a6e79d7 + 39fbc4c
commit a69118a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -62,9 +62,9 @@ install:
         fi
       else
         if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-          wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
+          wget https://repo.continuum.io/miniconda/Miniconda3-4.4.10-MacOSX-x86_64.sh -O miniconda.sh;
         else
-          wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+          wget https://repo.continuum.io/miniconda/Miniconda3-4.4.10-Linux-x86_64.sh -O miniconda.sh;
         fi
       fi
 

diff --git a/python/python/ert_gui/simulation/models/base_run_model.py b/python/python/ert_gui/simulation/models/base_run_model.py
@@ -10,20 +10,20 @@
 # 2. If self._job_queue is None - the decorator argument is returned.
 
 def job_queue(default):
-    
+
     def job_queue_decorator(method):
 
         def dispatch(self , *args, **kwargs):
 
             if self._job_queue is None:
                 return default
             else:
-                return method( self, *args , **kwargs) 
+                return method( self, *args , **kwargs)
 
         return dispatch
 
     return job_queue_decorator
-    
+
 
 class ErtRunError(Exception):
     pass
@@ -46,15 +46,15 @@ def __init__(self, name, queue_config, phase_count=1):
         self._queue_config = queue_config
         self._job_queue = None
         self.reset( )
-    
+
     def ert(self):
         """ @rtype: res.enkf.EnKFMain"""
         return ERT.ert
 
 
     def reset(self):
         self._failed = False
-        
+
 
     def startSimulations(self, arguments):
         try:
@@ -68,11 +68,11 @@ def startSimulations(self, arguments):
     def runSimulations(self, job_queue, run_context):
         raise NotImplementedError("Method must be implemented by inheritors!")
 
-    
+
     def create_context(self, arguments):
         raise NotImplementedError("Method must be implemented by inheritors!")
 
-    
+
     @job_queue(None)
     def killAllSimulations(self):
         self._job_queue.killAllJobs()
@@ -215,7 +215,7 @@ def getProgress(self):
     def isIndeterminate(self):
         """ @rtype: bool """
         return not self.isFinished() and self._indeterminate
-       
+
     def checkHaveSufficientRealizations(self, num_successful_realizations):
         if num_successful_realizations == 0:
             raise ErtRunError("Simulation failed! All realizations failed!")