Fix site extension issues

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Change Log
 
 ## [Unreleased]
+### Fixed
+- Site extension issues
 
 ## [2.6.0] - 2017-04-20
 ### Changed

site-extension/batch-shipyard.nuspec

@@ -2,17 +2,17 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>batch-shipyard</id>
-    <version>0.0.1.8</version>
+    <version>2.6.0.4</version>
     <title>Batch Shipyard</title>
     <authors>Fred Park</authors>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Execute jobs on Azure Batch via Batch Shipyard. Requires Python.</description>
-    <iconUrl>https://azurecomcdn.azureedge.net/cvt-351112a289cff390998cc55a66a04f540f6cecfdeffbeac6a482ab886a841f7c/images/page/services/batch/100x-scale.png</iconUrl>
+    <iconUrl>https://azurecomcdn.azureedge.net/cvt-4c210654e280636c85b81aae4511f99613c7de5d03801bf44dc15fe823371003/images/page/services/batch/we-take-care-of-scale.png</iconUrl>
     <projectUrl>https://github.com/Azure/batch-shipyard</projectUrl>
     <licenseUrl>https://github.com/Azure/batch-shipyard/blob/master/LICENSE</licenseUrl>
-	<copyright>Microsoft</copyright>
-	<releaseNotes>https://github.com/Azure/batch-shipyard/blob/master/CHANGELOG.md</releaseNotes>
-    <tags>azure batch shipyard docker containers python</tags>
+    <copyright>Microsoft</copyright>
+    <releaseNotes>https://github.com/Azure/batch-shipyard/blob/master/CHANGELOG.md</releaseNotes>
+    <tags>azure batch shipyard docker containers parallel distributed jobs hpc python</tags>
   </metadata>
   <files>
     <file src="*.cmd" target="content" />

site-extension/install.cmd

@@ -21,7 +21,14 @@ REM git clone repo
 taskkill /F /IM python.exe
 SET CLONEDIR=%HOME%\batch-shipyard
 IF EXIST "%CLONEDIR%" (
-    rd /s /q "%CLONEDIR%"
+    pushd "%CLONEDIR%"
+    git checkout master
+    git pull
+    IF %ERRORLEVEL% NEQ 0 (
+        cd %HOME%
+        rd /s /q "%CLONEDIR%"
+    )
+    popd
 )
 git clone "https://github.com/Azure/batch-shipyard.git" "%CLONEDIR%"
 IF %ERRORLEVEL% NEQ 0 (
@@ -47,3 +54,14 @@ IF %ERRORLEVEL% NEQ 0 (
     exit /b 1
 )
 popd
+
+REM futurize isodate (for some reason this is sometimes installed as python2)
+REM futurize is installed as part of future pypi package
+SET FUTURIZE=%PYTHONHOME%\Scripts\futurize.exe
+IF NOT EXIST "%FUTURIZE%" (
+    echo "%FUTURIZE% does not exist!
+    exit /b 1
+)
+pushd "%PYTHONHOME%\Lib\site-packages\isodate"
+"%FUTURIZE%" -0 -w -n .
+popd

site-extension/shipyard.cmd

@@ -1,3 +1,3 @@
 setlocal enabledelayedexpansion
 
-"%PYTHON%" -u "%HOME%\batch-shipyard\shipyard.py"
+"%PYTHON%" -u "%HOME%\batch-shipyard\shipyard.py" %*