Tag for 1.2.0 release

Azure · Apr 19, 2018 · c4f0a3a · c4f0a3a
1 parent 2ec1d6b
commit c4f0a3a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,20 @@
 
 ## [Unreleased]
 
+## [1.2.0] - 2018-04-19
+### Added
+- Support for --strip-components parameter on download (#69)
+- Support for -q/--quiet option to suppress output to stdout (#70)
+
 ### Changed
 - Update dependencies to latest
+- Update Windows Docker image to use Python 3.6.5
 
 ### Fixed
 - Non-MD5 upload invalid ref (#60)
 - Retry of broken encrypted upload (#61)
 - Detect non-Base64 encoded storage account keys (#62)
+- Regression in download of zero-length blobs (#68)
 
 ## [1.1.1] - 2018-01-30
 ### Changed
@@ -333,7 +340,8 @@ usage documentation carefully when upgrading from 0.12.1.
   `--no-skiponmatch`.
 - 0.8.2: performance regression fixes
 
-[Unreleased]: https://github.com/Azure/blobxfer/compare/1.1.1...HEAD
+[Unreleased]: https://github.com/Azure/blobxfer/compare/1.2.0...HEAD
+[1.2.0]: https://github.com/Azure/blobxfer/compare/1.1.0...1.2.0
 [1.1.1]: https://github.com/Azure/blobxfer/compare/1.1.0...1.1.1
 [1.1.0]: https://github.com/Azure/blobxfer/compare/1.0.0...1.1.0
 [1.0.0]: https://github.com/Azure/blobxfer/compare/1.0.0rc3...1.0.0
@@ -347,5 +355,5 @@ usage documentation carefully when upgrading from 0.12.1.
 [0.12.1]: https://github.com/Azure/blobxfer/compare/0.12.0...0.12.1
 [0.12.0]: https://github.com/Azure/blobxfer/compare/0.11.5...0.12.0
 [0.11.5]: https://github.com/Azure/blobxfer/compare/0.11.4...0.11.5
-[0.11.4]: https://github.com/Azure/blobxfer/compare/v0.11.2...0.11.4
-[0.11.2]: https://github.com/Azure/blobxfer/compare/e5e435a...v0.11.2
+[0.11.4]: https://github.com/Azure/blobxfer/compare/0.11.2...0.11.4
+[0.11.2]: https://github.com/Azure/blobxfer/compare/e5e435a...0.11.2
diff --git a/appveyor.yml b/appveyor.yml
@@ -61,23 +61,23 @@ after_test:
     if ($env:APPVEYOR_REPO_TAG -eq "true") {
       $env:BLOBXFER_ARTIFACT = "blobxfer-" + $env:APPVEYOR_REPO_TAG_NAME + "-win-amd64.exe"
       $env:UPLOAD_PATH="releases/" + $env:APPVEYOR_REPO_TAG_NAME
-      $env:BUILDVER_DOTTED = $env:APPVEYOR_REPO_TAG
+      $env:BUILDVER_DOTTED = $env:APPVEYOR_REPO_TAG_NAME
     }
     else {
       if ($env:APPVEYOR_REPO_BRANCH -eq "master" -Or $env:APPVEYOR_REPO_BRANCH -eq "develop") {
         $env:BLOBXFER_ARTIFACT = "blobxfer-" + $env:APPVEYOR_REPO_BRANCH + "-" + $env:APPVEYOR_BUILD_NUMBER + "-win-amd64.exe"
         $env:UPLOAD_PATH="builds/" + $env:APPVEYOR_REPO_BRANCH
-        $env:BUILDVER_DOTTED = [string]::Format("0.0.0.{0}",$env:APPVEYOR_BUILD_NUMBER)
+        $env:BUILDVER_DOTTED = [string]::Format("0.0.{0}",$env:APPVEYOR_BUILD_NUMBER)
       }
       else {
         Write-Host "Invalid tag or branch $env:APPVEYOR_REPO_BRANCH to build binary"
         return
       }
     }
 
-    $bvt0,$bvt1,$bvt2,$bvt3 = $env:BUILDVER_DOTTED.split('.')
+    $bvt0,$bvt1,$bvt2 = $env:BUILDVER_DOTTED.split('.')
 
-    $env:BUILDVER_TUPLE = [string]::Format("({0}, {1}, {2}, {3})",$bvt0,$bvt1,$bvt2,$bvt3)
+    $env:BUILDVER_TUPLE = [string]::Format("({0}, {1}, {2}, 0)",$bvt0,$bvt1,$bvt2)
 
     $env:BRANCH_GITSHA1 = [string]::Format("{0}@{1}",$env:APPVEYOR_REPO_BRANCH,$env:APPVEYOR_REPO_COMMIT.Substring(0,7))
 

diff --git a/blobxfer/version.py b/blobxfer/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__ = '1.1.1'
+__version__ = '1.2.0'
diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile
@@ -16,6 +16,7 @@ RUN apk update \
     && pip3 install --no-cache-dir -e . \
     && python3 setup.py install \
     && cp THIRD_PARTY_NOTICES.txt /BLOBXFER_THIRD_PARTY_NOTICES.txt \
+    && cp LICENSE /BLOBXFER_LICENSE.txt \
     && cd / \
     && rm -rf blobxfer \
     && apk del --purge build-base python3-dev libressl-dev libffi-dev git \

diff --git a/docker/win/Dockerfile b/docker/win/Dockerfile
@@ -24,6 +24,7 @@ FROM microsoft/nanoserver
 
 COPY --from=0 /Python /Python
 COPY --from=0 /blobxfer/THIRD_PARTY_NOTICES.txt /BLOBXFER_THIRD_PARTY_NOTICES.txt
+COPY --from=0 /blobxfer/LICENSE /BLOBXFER_LICENSE.txt
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@
     'click==6.7',
     'cryptography>=2.2.2',
     'future==0.16.0',
-    'pathlib2==2.3.0;python_version<"3.5"',
+    'pathlib2==2.3.2;python_version<"3.5"',
     'python-dateutil==2.7.2',
     'requests==2.18.4',
     'ruamel.yaml==0.15.37',