Tag for 1.11.0 release

- Update dependencies and pipeline
- Move Windows container build to 2019

Author: alfpark

.vsts/pipeline.yml

@@ -1,16 +1,16 @@
 name: $(SourceBranch)$(Rev:.r)
 
 variables:
-  VENV_VERSION: '20.4.3'
-  PY36_VER: '3.6.13'
-  PY37_VER: '3.7.10'
-  PY38_VER: '3.8.9'
-  PY39_VER: '3.9.4'
+  VENV_VERSION: '20.8.0'
+  PY36_VER: '3.6.15'
+  PY37_VER: '3.7.12'
+  PY38_VER: '3.8.12'
+  PY39_VER: '3.9.7'
 
 jobs:
   - job: ComponentGovernance
     pool:
-      vmImage: vs2017-win2016
+      vmImage: windows-2019
     condition: ne(variables['Build.Reason'], 'PullRequest')
     variables:
       EnableDetectorPip: true
@@ -21,7 +21,7 @@ jobs:
 
   - job: Windows
     pool:
-      vmImage: vs2017-win2016
+      vmImage: windows-2019
     strategy:
       maxParallel: 0
       matrix:
@@ -293,7 +293,7 @@ jobs:
 
   - job: MacOS
     pool:
-      vmImage: macOS-10.15
+      vmImage: macOS-11
     strategy:
       maxParallel: 0
       matrix:

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [1.11.0] - 2021-09-27
+### Changed
+- Updated dependencies
+- Binary builds and Docker images are now built against Python 3.9.7
+- MacOS X binary built against 11
+
 ## [1.10.0] - 2021-04-19
 ### Changed
 - Updated dependencies
@@ -564,7 +570,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.10.0...HEAD
+[Unreleased]: https://github.com/Azure/blobxfer/compare/1.11.0...HEAD
+[1.11.0]: https://github.com/Azure/blobxfer/compare/1.10.0...1.11.0
 [1.10.0]: https://github.com/Azure/blobxfer/compare/1.9.4...1.10.0
 [1.9.4]: https://github.com/Azure/blobxfer/compare/1.9.3...1.9.4
 [1.9.3]: https://github.com/Azure/blobxfer/compare/1.9.2...1.9.3

README.md

@@ -71,9 +71,10 @@ Please see the
 for project history.
 
 ## Support
-This project is community supported and not officially supported by Microsoft. There is
-no defined SLA for addressing features, issues, and bugs which are exclusively serviced via
-GitHub issues. For tools officially supported by Microsoft please refer to this
+This project is community supported and not officially supported by Microsoft.
+There is no defined SLA for addressing features, issues, and bugs which are
+exclusively serviced via GitHub issues. For tools officially supported by
+Microsoft please refer to this
 [documentation](https://docs.microsoft.com/azure/storage/common/storage-choose-data-transfer-solution).
 
 * * *

THIRD_PARTY_NOTICES.txt

@@ -40,7 +40,7 @@ bitstring (https://github.com/scott-griffiths/bitstring)
 
 The MIT License
 
-Copyright (c) 2006-2016 Scott Griffiths ([email protected])
+Copyright (c) 2006 Scott Griffiths ([email protected])
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -322,9 +322,9 @@ version prepared by Licensee.  Alternately, in lieu of CNRI's License
 Agreement, Licensee may substitute the following text (omitting the
 quotes): "Python 1.6.1 is made available subject to the terms and
 conditions in CNRI's License Agreement.  This Agreement together with
-Python 1.6.1 may be located on the Internet using the following
+Python 1.6.1 may be located on the internet using the following
 unique, persistent identifier (known as a handle): 1895.22/1013.  This
-Agreement may also be obtained from a proxy server on the Internet
+Agreement may also be obtained from a proxy server on the internet
 using the following URL: http://hdl.handle.net/1895.22/1013".
 
 3. In the event Licensee prepares a derivative work that is based on

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.10.0'
+__version__ = '1.11.0'

docker/gen_3rd_party_notices.sh

@@ -14,13 +14,13 @@ DEPENDENCIES=(
     https://github.com/scott-griffiths/bitstring/raw/master/LICENSE
     click
     https://github.com/pallets/click
-    https://github.com/pallets/click/raw/master/LICENSE.rst
+    https://github.com/pallets/click/raw/main/LICENSE.rst
     cryptography
     https://github.com/pyca/cryptography
     https://github.com/pyca/cryptography/raw/main/LICENSE.BSD
     Python
     https://python.org
-    https://github.com/python/cpython/raw/master/LICENSE
+    https://github.com/python/cpython/raw/main/LICENSE
     python-dateutil
     https://github.com/dateutil/dateutil
     https://github.com/dateutil/dateutil/raw/master/LICENSE

docker/linux/Dockerfile

@@ -1,6 +1,6 @@
 # Dockerfile for Azure/blobxfer (Linux)
 
-FROM python:3.9.4-alpine3.13
+FROM python:3.9.7-alpine3.14
 MAINTAINER Fred Park <https://github.com/Azure/blobxfer>
 
 ARG GIT_BRANCH

docker/win/Dockerfile

@@ -1,7 +1,6 @@
 # Dockerfile for Azure/blobxfer (Windows)
-# Adapted from: https://github.com/StefanScherer/dockerfiles-windows/blob/master/python/Dockerfile
 
-FROM python:3.9.4-windowsservercore-ltsc2016
+FROM python:3.9.7-windowsservercore-1809
 MAINTAINER Fred Park <https://github.com/Azure/blobxfer>
 
 ENV chocolateyUseWindowsCompression false
@@ -21,26 +20,12 @@ RUN git clone -b $Env:GIT_BRANCH --single-branch --depth 5 https://github.com/Az
 RUN python -m compileall C:\Python\Lib\site-packages ; \
     exit 0
 
-FROM mcr.microsoft.com/windows/nanoserver:sac2016
+FROM mcr.microsoft.com/windows/nanoserver:1809
 
 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';"]
 
-ENV PYTHON_VERSION 3.9.4
-ENV PYTHON_PIP_VERSION 21.0.1
-
-RUN $env:PATH = 'C:\Python;C:\Python\Scripts;{0}' -f $env:PATH ; \
-    Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment\' -Name Path -Value $env:PATH ; \
-    mkdir $env:APPDATA\Python\Python37\site-packages ; \
-    Invoke-WebRequest 'https://bootstrap.pypa.io/get-pip.py' -OutFile 'get-pip.py' -UseBasicParsing ; \
-    $replace = ('import tempfile{0}import site{0}site.getusersitepackages()' -f [char][int]10) ; \
-    Get-Content get-pip.py | Foreach-Object { $_ -replace 'import tempfile', $replace } | Out-File -Encoding Ascii getpip.py ; \
-    $pipInstall = ('pip=={0}' -f $env:PYTHON_PIP_VERSION) ; \
-    python getpip.py $pipInstall ; \
-    Remove-Item get-pip.py ; \
-    Remove-Item getpip.py
-
 ENTRYPOINT ["blobxfer"]

setup.py

@@ -31,12 +31,12 @@
 install_requires = [
     'azure-storage-blob>=2.1.0,<3',
     'azure-storage-file>=2.1.0,<3',
-    'bitstring>=3.1.7,<4',
-    'click>=7.0,<8',
+    'bitstring>=3.1.9,<4',
+    'click>=8.0.1,<9',
     'cryptography>=3.3.2',
-    'python-dateutil>=2.8.1,<3',
-    'requests>=2.25.1,<3',
-    'ruamel.yaml>=0.16.9',
+    'python-dateutil>=2.8.2,<3',
+    'requests>=2.26.0,<3',
+    'ruamel.yaml>=0.17.3',
 ]
 
 setup(

test_requirements.txt

@@ -1,4 +1,4 @@
 coverage==5.5
-flake8==3.9.0
-pytest==6.2.3
-pytest-cov==2.11.1
+flake8==3.9.2
+pytest==6.2.5
+pytest-cov==2.12.1