From 8577232349fe66f2e6ef67a80435bc1a4c9b9dab Mon Sep 17 00:00:00 2001
From: Fred Park <fred.park@microsoft.com>
Date: Wed, 23 Nov 2016 09:06:37 -0800
Subject: [PATCH] Tag for 2.0.0 release

---
 CHANGELOG.md                           |  5 ++++-
 convoy/batch.py                        | 17 ++++++++++++-----
 convoy/version.py                      |  2 +-
 docs/01-batch-shipyard-installation.md |  2 +-
 requirements.txt                       |  2 +-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46997c65..d02631bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 
 ## [Unreleased]
+
+## [2.0.0] - 2016-11-23
 ### Added
 - Support for any Internet accessible container registry, including
 [Azure Container Registry](https://azure.microsoft.com/en-us/services/container-registry/).
@@ -251,7 +253,8 @@ transfer is disabled
 #### Added
 - Initial release
 
-[Unreleased]: https://github.com/Azure/batch-shipyard/compare/2.0.0rc3...HEAD
+[Unreleased]: https://github.com/Azure/batch-shipyard/compare/2.0.0...HEAD
+[2.0.0]: https://github.com/Azure/batch-shipyard/compare/2.0.0rc3...2.0.0
 [2.0.0rc3]: https://github.com/Azure/batch-shipyard/compare/2.0.0rc2...2.0.0rc3
 [2.0.0rc2]: https://github.com/Azure/batch-shipyard/compare/2.0.0rc1...2.0.0rc2
 [2.0.0rc1]: https://github.com/Azure/batch-shipyard/compare/1.1.0...2.0.0rc1
diff --git a/convoy/batch.py b/convoy/batch.py
index c896abdf..6dc9f989 100644
--- a/convoy/batch.py
+++ b/convoy/batch.py
@@ -1428,18 +1428,25 @@ def list_tasks(batch_client, config, jobid=None):
                                   task.execution_info.
                                   scheduling_error.message)
                     else:
-                        ei = (' start_time={} end_time={} '
+                        if (task.execution_info.end_time is not None and
+                                task.execution_info.start_time is not None):
+                            duration = (task.execution_info.end_time -
+                                        task.execution_info.start_time)
+                        else:
+                            duration = 'n/a'
+                        ei = (' start_time={} end_time={} duration={} '
                               'exit_code={}').format(
                                   task.execution_info.start_time,
                                   task.execution_info.end_time,
+                                  duration,
                                   task.execution_info.exit_code)
                 else:
                     ei = ''
                 logger.info(
-                    'job_id={} task_id={} [display_name={} state={} '
-                    'pool_id={} node_id={}{}]'.format(
-                        job_id, task.id, task.display_name, task.state,
-                        task.node_info.pool_id, task.node_info.node_id, ei))
+                    'job_id={} task_id={} [state={} pool_id={} '
+                    'node_id={}{}]'.format(
+                        job_id, task.id, task.state, task.node_info.pool_id,
+                        task.node_info.node_id, ei))
                 i += 1
         except batchmodels.batch_error.BatchErrorException as ex:
             if 'The specified job does not exist' in ex.message.value:
diff --git a/convoy/version.py b/convoy/version.py
index 72ea6284..c4251bb3 100644
--- a/convoy/version.py
+++ b/convoy/version.py
@@ -22,4 +22,4 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
-__version__ = '2.0.0rc3'
+__version__ = '2.0.0'
diff --git a/docs/01-batch-shipyard-installation.md b/docs/01-batch-shipyard-installation.md
index a34c6ab2..93d0d112 100644
--- a/docs/01-batch-shipyard-installation.md
+++ b/docs/01-batch-shipyard-installation.md
@@ -25,7 +25,7 @@ To install required software:
 cd batch-shipyard
 # Install for Python2
 ./install.sh
-# Or if you prefer Python3
+# Or to install for Python3 (recommended)
 ./install.sh -3
 ```
 Please ensure that you are not invoking the install script as root. `sudo`
diff --git a/requirements.txt b/requirements.txt
index 5d4f76e0..98415776 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,4 @@ blobxfer==0.12.0
 click==6.6
 future==0.16.0
 pathlib2==2.1.0; python_version < '3.5'
-scandir==1.3; python_version < '3.5'
+scandir==1.4; python_version < '3.5'