Fix Windows bug

Update URLs to gsi.upm.es

.dockerignore

@@ -1,4 +1,5 @@
 **/soil_output
 .*
+**/__pycache__
 __pycache__
 *.pyc

CHANGELOG.md

@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.14.8]
+### Fixed
+* Invalid directory names in Windows gsi-upm/soil#5
 ## [0.14.7]
 ### Changed
 * Minor change to traceback handling in async simulations

README.md

@@ -30,5 +30,5 @@ If you use Soil in your research, don't forget to cite this paper:
 
 @Copyright GSI - Universidad Politécnica de Madrid 2017
 
-[![SOIL](logo_gsi.png)](https://www.gsi.dit.upm.es)
+[![SOIL](logo_gsi.png)](https://www.gsi.upm.es)
 

docs/installation.rst

@@ -14,11 +14,11 @@ Now test that it worked by running the command line tool
 
    soil --help
 
-Or using soil programmatically:
+Or, if you're using using soil programmatically:
 
 .. code:: python
 
    import soil
    print(soil.__version__)
 
-The latest version can be installed through `GitLab <https://lab.cluster.gsi.dit.upm.es/soil/soil.git>`_.
+The latest version can be installed through `GitLab <https://lab.gsi.upm.es/soil/soil.git>`_ or `GitHub <https://github.com/gsi-upm/soil>`_.

requirements.txt

@@ -5,6 +5,6 @@ numpy
 matplotlib
 pyyaml>=5.1
 pandas>=0.23
-scipy==1.2.1 # scipy 1.3.0rc1 is not compatible with salib
+scipy>=1.3
 SALib>=1.3
 Jinja2

soil/VERSION

@@ -1 +1 @@
-0.14.7
+0.14.8

soil/simulation.py

@@ -94,7 +94,7 @@ class Simulation(NetworkSimulation):
         self.seed = str(seed) or str(time.time())
         self.load_module = load_module
         self.network_params = network_params
-        self.name = name or 'Unnamed_' + time.strftime("%Y-%m-%d_%H:%M:%S")
+        self.name = name or 'Unnamed_' + time.strftime("%Y-%m-%d_%H.%M.%S")
         self.group = group or None
         self.num_trials = num_trials
         self.max_time = max_time

soil/utils.py

@@ -31,7 +31,7 @@ def safe_open(path, mode='r', backup=True, **kwargs):
         os.makedirs(outdir)
     if backup and 'w' in mode and os.path.exists(path):
         creation = os.path.getctime(path)
-        stamp = time.strftime('%Y-%m-%d_%H:%M', time.localtime(creation))
+        stamp = time.strftime('%Y-%m-%d_%H.%M', time.localtime(creation))
 
         backup_dir = os.path.join(outdir, stamp)
         if not os.path.exists(backup_dir):