Merge branch 'master' into release

thewtex · thewtex · commit 54b83ff2b619 · 2021-03-04T08:32:30.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,8 +74,8 @@ if(ITKPythonPackage_SUPERBUILD)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
 
-  # ITK nightly-master 2021-02-10
-  set(ITK_GIT_TAG "v5.2rc02")
+  # ITK nightly-master 2021-03-02
+  set(ITK_GIT_TAG "4d592ddc29")
 
   #-----------------------------------------------------------------------------
   # A separate project is used to download ITK, so that it can reused
diff --git a/itkVersion.py b/itkVersion.py
@@ -1,4 +1,4 @@
-VERSION = '5.2rc2'
+VERSION = '5.2rc02.dev20210302+75.g4d592ddc29'
 
 def get_versions():
     """Returns versions for the ITK Python package.
diff --git a/scripts/macpython-build-tarball.sh b/scripts/macpython-build-tarball.sh
@@ -11,6 +11,7 @@ tar -cf ITKPythonBuilds-macosx.tar \
   ITKPythonPackageRequiredExtractionDir.txt \
   ITKPythonPackage/scripts
 /usr/local/bin/zstd -f \
+  -15 \
   ./ITKPythonBuilds-macosx.tar \
   -o ./ITKPythonBuilds-macosx.tar.zst
 popd > /dev/null

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION = '5.2rc2'`
	`1`	`+VERSION = '5.2rc02.dev20210302+75.g4d592ddc29'`
`2`	`2`
`3`	`3`	`def get_versions():`
`4`	`4`	`"""Returns versions for the ITK Python package.`