From 6118f917ee5a6b3a2407087dd478d7d006b14e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Tue, 7 Jul 2020 10:57:10 +0200
Subject: [PATCH] Fix Windows bug

Update URLs to gsi.upm.es
---
 .dockerignore         | 1 +
 CHANGELOG.md          | 3 +++
 README.md             | 2 +-
 docs/installation.rst | 4 ++--
 requirements.txt      | 2 +-
 soil/VERSION          | 2 +-
 soil/simulation.py    | 2 +-
 soil/utils.py         | 2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index ad5f338..ca54692 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,5 @@
 **/soil_output
 .*
+**/__pycache__
 __pycache__
 *.pyc
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0694420..4e53de5 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/README.md b/README.md
index a626929..919624c 100644
--- a/README.md
+++ b/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)
 
diff --git a/docs/installation.rst b/docs/installation.rst
index 1daa84d..9d63bca 100644
--- a/docs/installation.rst
+++ b/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>`_.
diff --git a/requirements.txt b/requirements.txt
index ae7b426..19349a2 100644
--- a/requirements.txt
+++ b/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
diff --git a/soil/VERSION b/soil/VERSION
index 0adfe40..13a0c2a 100644
--- a/soil/VERSION
+++ b/soil/VERSION
@@ -1 +1 @@
-0.14.7
\ No newline at end of file
+0.14.8
\ No newline at end of file
diff --git a/soil/simulation.py b/soil/simulation.py
index a414da4..3bcb345 100644
--- a/soil/simulation.py
+++ b/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
diff --git a/soil/utils.py b/soil/utils.py
index c3a5caf..0b8150d 100644
--- a/soil/utils.py
+++ b/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):