Bump v1.2.5(<--1.2.4).

FIX `mkdirs` bug.
JRCSTU · May 25, 2016 · be4a84a · be4a84a
1 parent 5a821e3
commit be4a84a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 22 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,9 +4,16 @@ CO2MPAS Changes
 .. contents::
 .. _changes:
 
-
-v1.2.4, file-ver: 2.2, 12-May 2016: "Panino/Sandwich" release ("PS")
+v1.2.5, file-ver: 2.2, 25-May 2016: "Panino/Sandwich" release ("PS")
 ====================================================================
+3nd POST-Panino release.
+It contains a bug fix in for creating directories.
+
+It is not accompanied by an ALLINONE archive.
+
+
+v1.2.4, file-ver: 2.2, 12-May 2016: retracted release
+=====================================================
 2nd POST-Panino release.
 It contains the minor filtering fixes from ``1.2.3`` EXCEPT from
 the thermal changes, so as to maintain the model behavior of ``1.2.2``.

diff --git a/README.rst b/README.rst
@@ -8,8 +8,8 @@
 CO2MPAS: Vehicle simulator predicting NEDC CO2 emissions from WLTP
 ##################################################################
 
-:Release:       1.2.4
-:Date:          2016-05-12 16:46:00
+:Release:       1.2.5
+:Date:          2016-05-25 12:49:00
 :Home:          http://co2mpas.io/
 :Releases:      http://files.co2mpas.io/
 :Sources:       https://github.com/JRCSTU/co2mpas
@@ -262,7 +262,7 @@ CO2MPAS installation
         Downloading http://pypi.co2mpas.io/packages/co2mpas-...
         ...
         Installing collected packages: co2mpas
-        Successfully installed co2mpas-1.2.4
+        Successfully installed co2mpas-1.2.5
 
    .. Warning::
         **Installation failures:**
@@ -283,12 +283,12 @@ CO2MPAS installation
    .. code-block:: console
 
        > co2mpas -vV
-       co2mpas_version: 1.2.4
-       co2mpas_rel_date: 2016-05-12 16:46:00
-       co2mpas_path: d:\co2mpas_ALLINONE-64bit-v1.2.4.dev1\Apps\WinPython\python-3.4.3\lib\site-packages\co2mpas
-       python_path: D:\co2mpas_ALLINONE-64bit-v1.2.4.dev1\WinPython\python-3.4.3
+       co2mpas_version: 1.2.5
+       co2mpas_rel_date: 2016-05-25 12:49:00
+       co2mpas_path: d:\co2mpas_ALLINONE-64bit-v1.2.5.dev1\Apps\WinPython\python-3.4.3\lib\site-packages\co2mpas
+       python_path: D:\co2mpas_ALLINONE-64bit-v1.2.5.dev1\WinPython\python-3.4.3
        python_version: 3.4.3 (v3.4.3:9b73f1c3e601, Feb 24 2015, 22:44:40) [MSC v.1600 XXX]
-       PATH: D:\co2mpas_ALLINONE-64bit-v1.2.4.dev1\WinPython...
+       PATH: D:\co2mpas_ALLINONE-64bit-v1.2.5.dev1\WinPython...
 
 
    .. Note::
@@ -388,7 +388,7 @@ require the use of ``pip`` command from a *console* to install:
   1. With with a "regular" browser and when connected to the Internet,
      pre-download locally all files present in the ``packages`` folder
      located in the desired CO2MPAS version in the *CO2MPAS site*
-     (e.g. http://files.co2mpas.io/CO2MPAS-1.2.4/packages/).
+     (e.g. http://files.co2mpas.io/CO2MPAS-1.2.5/packages/).
 
   2. Install *co2mpas*, referencing the above folder.
      Assuming that you downloaded the packages in the folder ``path/to/co2mpas_packages``,
@@ -817,7 +817,7 @@ The output-files produced on each run are the following:
 .. tip::
 
     Additionally, a sample output file is provide here:
-    http://files.co2mpas.io/CO2MPAS-1.2.4/co2mpas-empty_output-2.2.xlsx
+    http://files.co2mpas.io/CO2MPAS-1.2.5/co2mpas-empty_output-2.2.xlsx
 
 
 Entering new vehicles
@@ -860,7 +860,7 @@ excel-file:
 
    .. tip::
        You may also read the `"annotated" input excel-file
-       <http://files.co2mpas.io/CO2MPAS-1.2.4/co2mpas-annotated_input-2.2.xls>`_
+       <http://files.co2mpas.io/CO2MPAS-1.2.5/co2mpas-annotated_input-2.2.xls>`_
        to get an understanding of each scalar paramet and series required,
        but **DO NOT USE THIS "fatty" xl-file (~10Mb) when running the model.**
 

diff --git a/co2mpas/__main__.py b/co2mpas/__main__.py
@@ -410,7 +410,7 @@ def _cmd_sa(opts):
 
     if not osp.isdir(out_folder):
         if force:
-            from co2mpas.dispatcher.utils.io import mkdirs
+            from graphviz.tools import mkdirs
             if not ''.endswith('/'):
                 out_folder = '%s/' % out_folder
             mkdirs(out_folder)
@@ -449,7 +449,7 @@ def _run_batch(opts):
 
     if not osp.isdir(output_folder):
         if opts['--force']:
-            from co2mpas.dispatcher.utils.io import mkdirs
+            from graphviz.tools import mkdirs
             if not ''.endswith('/'):
                 output_folder = '%s/' % output_folder
             mkdirs(output_folder)

diff --git a/co2mpas/_version.py b/co2mpas/_version.py
@@ -7,7 +7,7 @@
 
 
 #: Authoritative project's PEP 440 version.
-__version__ = version = "1.2.4"  # Also update README.rst, doc/allinone.rst, CHANGES.rst,
+__version__ = version = "1.2.5"  # Also update README.rst, doc/allinone.rst, CHANGES.rst,
 
 #: Input/Output file's version.
 __file_version__ = "2.2"
@@ -17,4 +17,4 @@
 
 # Please UPDATE TIMESTAMP WHEN BUMPING VERSIONS AND BEFORE RELEASE.
 #: Release date.
-__updated__ = "2016-05-05 18:04:00"
+__updated__ = "2016-05-25 12:49:00"
diff --git a/doc/allinone.rst b/doc/allinone.rst
@@ -85,21 +85,21 @@ A pre-populated folder with WinPython + CO2MPAS + Consoles for *Windows*.
 
             REM The python-interpreter that comes 1st is what we care about.
             > where python
-            D:\co2mpas_ALLINONE-64bit-v1.2.4\Apps\WinPython-64bit-3.4.3.5\python-3.4.3\python.exe
-            D:\co2mpas_ALLINONE-64bit-v1.2.4\Apps\Cygwin\bin\python
+            D:\co2mpas_ALLINONE-64bit-v1.2.5\Apps\WinPython-64bit-3.4.3.5\python-3.4.3\python.exe
+            D:\co2mpas_ALLINONE-64bit-v1.2.5\Apps\Cygwin\bin\python
 
             > co2mpas --version
-            co2mpas-1.2.4 at D:\co2mpas_ALLINONE-64bit-v1.2.4\Apps\WinPython-64bit-3.4.3.5\python-3.4.3\lib\site-packages\co2mpas
+            co2mpas-1.2.5 at D:\co2mpas_ALLINONE-64bit-v1.2.5\Apps\WinPython-64bit-3.4.3.5\python-3.4.3\lib\site-packages\co2mpas
 
         - In *bash*, type:
 
           .. code-block:: console
 
             > which python
-            /cygdrive/d/co2mpas_ALLINONE-64bit-v1.2.4/Apps/WinPython-64bit-3.4.3.5/python-3.4.3/python
+            /cygdrive/d/co2mpas_ALLINONE-64bit-v1.2.5/Apps/WinPython-64bit-3.4.3.5/python-3.4.3/python
 
             > co2mpas --version
-            co2mpas-1.2.4 at D:\co2mpas_ALLINONE-64bit-v1.2.4\Apps\WinPython-64bit-3.4.3.5\python-3.4.3\lib\site-packages\co2mpas
+            co2mpas-1.2.5 at D:\co2mpas_ALLINONE-64bit-v1.2.5\Apps\WinPython-64bit-3.4.3.5\python-3.4.3\lib\site-packages\co2mpas
 
    In case of problems, copy-paste the output from the above commands and send
    it to JRC.