diff options
| author | Simo Fält <simo.falt@qt.io> | 2020-04-17 12:18:25 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2020-04-18 21:34:10 +0300 |
| commit | ea5e634a8d20e9b1fa385541b7d4af0e12aff647 (patch) | |
| tree | 5bfa29bba9c52aa42943aa45adbe5d8e7526f432 | |
| parent | 1bca8bf41719a051df7304101b48ca1db6112088 (diff) | |
Bump version number for fix release
Also skipping the patch version assert.
Change-Id: I9dd35877b2123fe3682cfccfc8e59e4f978b0312
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | sources/pyside2/pyside_version.py | 2 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtCore/versioninfo_test.py | 2 | ||||
| -rw-r--r-- | sources/shiboken2/shiboken_version.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index 53ec83369..fc04d00a7 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -39,7 +39,7 @@ major_version = "5" minor_version = "14" -patch_version = "2" +patch_version = "2.1" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). diff --git a/sources/pyside2/tests/QtCore/versioninfo_test.py b/sources/pyside2/tests/QtCore/versioninfo_test.py index c682dbbdc..8b93fde8d 100644 --- a/sources/pyside2/tests/QtCore/versioninfo_test.py +++ b/sources/pyside2/tests/QtCore/versioninfo_test.py @@ -44,7 +44,7 @@ class TestVersionInfo(unittest.TestCase): self.assertEqual(len(v), 5) self.assertEqual(type(v[0]), int) self.assertEqual(type(v[1]), int) - self.assertEqual(type(v[2]), int) + #self.assertEqual(type(v[2]), int) disabled for 5.14.2.1 fix self.assertEqual(type(v[3]), str) self.assertEqual(type(v[4]), str) diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index 53ec83369..fc04d00a7 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_version.py @@ -39,7 +39,7 @@ major_version = "5" minor_version = "14" -patch_version = "2" +patch_version = "2.1" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). |