From acccc655842ccc038ee66e04a74702a7de78ff79 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 20 May 2019 20:53:42 -0700 Subject: [PATCH 1/7] Clear the build flags --- buildtools/version.py | 2 +- demo/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/version.py b/buildtools/version.py index bb3476a3..fe8a7385 100644 --- a/buildtools/version.py +++ b/buildtools/version.py @@ -26,7 +26,7 @@ VER_MAJOR = 4 VER_MINOR = 0 VER_RELEASE = 6 -VER_FLAGS = "a1" # wxPython release flags +VER_FLAGS = "" # wxPython release flags # The VER_FLAGS value is appended to the version number constructed from the # first 3 components and should be set according to the following patterns. diff --git a/demo/version.py b/demo/version.py index dee0ebf0..4df20771 100644 --- a/demo/version.py +++ b/demo/version.py @@ -1,3 +1,3 @@ # This file was generated by wxPython's wscript. -VERSION_STRING = '4.0.5a1' +VERSION_STRING = '4.0.6' From cd656019f86e4d53171eba26c711844dd6feffc8 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 20 May 2019 21:25:31 -0700 Subject: [PATCH 2/7] Set release date --- CHANGES.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 21e7abd7..c4c770ce 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,13 +10,13 @@ wxPython Changelog 4.0.6 "Applesauce" ------------------ -* (not yet released) +* 20-May-2019 PyPI: https://pypi.org/project/wxPython/4.0.6 Extras: https://extras.wxPython.org/wxPython4/extras/ Pip: ``pip install wxPython==4.0.6`` -Changes in this release include the following: +This release provides the following fix: * Fixed a probably rare, but fatal bug on OSX when calling certain overloaded virtual methods with implementations in Python. From 9e89aa7089ebec4b60c5763ea8519d57d7215fda Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 20 May 2019 21:28:10 -0700 Subject: [PATCH 3/7] Update announcement --- packaging/ANNOUNCE.txt | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/packaging/ANNOUNCE.txt b/packaging/ANNOUNCE.txt index e6d47e20..397eaa9b 100644 --- a/packaging/ANNOUNCE.txt +++ b/packaging/ANNOUNCE.txt @@ -9,45 +9,17 @@ -Announcing wxPython 4.0.5 +Announcing wxPython 4.0.6 ========================= -PyPI: https://pypi.org/project/wxPython/4.0.5 +PyPI: https://pypi.org/project/wxPython/4.0.6 Extras: https://extras.wxPython.org/wxPython4/extras/ -Pip: ``pip install wxPython==4.0.5`` - -Changes in this release include the following: - - -* Added missing HtmlWindow.ScrollToAnchor method, and also a couple methods - in HtmlCell too. (#1141) - -* Added missing setters for the wheel-related properties in wx.MouseEvent. - (#1140) - -* Updated wxWidgets commit reference, bringing fixes for #1140, #1086 and - #1147. - -* Fix the use of the output parameter in HtmlWindow.OnOpeningURL the same way - it was fixed in HtmlWindowInterface.OnHTMLOpeningURL. (#1068) - -* Fixed a crashing bug when using a member of a transient wx.VisualAttributes - object. Also set the attributes to be read-only to simplify the fix. (#1198). - -* Updated the sip being used in wxPython builds to version 4.19.16. - -* Added helper functions to check results of wxWidgets configure during the - build of wxPython. Currently used to determine if the wx webview, glcanvas, - and media libraries should be added to the link command. (#1138) - -* Fixed scrollbar issue with ListCtrlAutoWidthMixin (#1215) - -* Fixed file access in the wx.py and wx.tools.pywxrc packages to be Python 2 and - 3 compatible. (#1193, #1156) - -* Fixes for building with Python 3.8 on Linux. (#1227) +Pip: ``pip install wxPython==4.0.6`` +This is a quick-fix release to take care of the following issue: +* Fixed a probably rare, but fatal bug on OSX when calling certain + overloaded virtual methods with implementations in Python. From 139d7315bdd56c95953c944fba1c63bb57ae9c32 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 21 May 2019 09:20:04 -0700 Subject: [PATCH 4/7] Another date and changelog update --- CHANGES.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index c4c770ce..f4362db4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -10,18 +10,20 @@ wxPython Changelog 4.0.6 "Applesauce" ------------------ -* 20-May-2019 +* 21-May-2019 PyPI: https://pypi.org/project/wxPython/4.0.6 Extras: https://extras.wxPython.org/wxPython4/extras/ Pip: ``pip install wxPython==4.0.6`` -This release provides the following fix: +This release provides the following fixes: * Fixed a probably rare, but fatal bug on OSX when calling certain overloaded virtual methods with implementations in Python. - +* Reverted the change that loads up install_requires from the contents of + requirements.txt. + 4.0.5 "St. Helens Day" From e70e3fef87b525732290d7db05ef89012e0988c0 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 21 May 2019 12:22:54 -0700 Subject: [PATCH 5/7] Yet another changelog update --- CHANGES.rst | 6 +++++- packaging/ANNOUNCE.txt | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index f4362db4..12b6f21d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -21,8 +21,12 @@ This release provides the following fixes: * Fixed a probably rare, but fatal bug on OSX when calling certain overloaded virtual methods with implementations in Python. +* Fixed char pointers in generated stub code to have a valid pointer value. + * Reverted the change that loads up install_requires from the contents of - requirements.txt. + requirements.txt. Split the requirements.txt file into one for install and one + for development. + diff --git a/packaging/ANNOUNCE.txt b/packaging/ANNOUNCE.txt index 397eaa9b..e969cefc 100644 --- a/packaging/ANNOUNCE.txt +++ b/packaging/ANNOUNCE.txt @@ -21,6 +21,10 @@ This is a quick-fix release to take care of the following issue: * Fixed a probably rare, but fatal bug on OSX when calling certain overloaded virtual methods with implementations in Python. +* Reverted the change that loads up install_requires from the contents of + requirements.txt. Split the requirements.txt file into one for install and one + for development. + What is wxPython? From b417c232622f32ba8b8dccaf333f6585eadedcb3 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 22 May 2019 10:46:03 -0700 Subject: [PATCH 6/7] Bump version for next 4.0.x release, if any. --- buildtools/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildtools/version.py b/buildtools/version.py index fe8a7385..dfcfef3f 100644 --- a/buildtools/version.py +++ b/buildtools/version.py @@ -24,9 +24,9 @@ PROJECT_NAME = 'wxPython' # version numbers. VER_MAJOR = 4 VER_MINOR = 0 -VER_RELEASE = 6 +VER_RELEASE = 7 -VER_FLAGS = "" # wxPython release flags +VER_FLAGS = "a1" # wxPython release flags # The VER_FLAGS value is appended to the version number constructed from the # first 3 components and should be set according to the following patterns. From 4f84f6229a9b5e5046671f3f4a593877b919b8df Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 22 May 2019 10:46:51 -0700 Subject: [PATCH 7/7] Tweaks for supporting docs --- packaging/ANNOUNCE.txt | 11 +++++++---- packaging/HOWTO-Release.rst | 8 ++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packaging/ANNOUNCE.txt b/packaging/ANNOUNCE.txt index e969cefc..eb4adf0d 100644 --- a/packaging/ANNOUNCE.txt +++ b/packaging/ANNOUNCE.txt @@ -16,14 +16,17 @@ PyPI: https://pypi.org/project/wxPython/4.0.6 Extras: https://extras.wxPython.org/wxPython4/extras/ Pip: ``pip install wxPython==4.0.6`` -This is a quick-fix release to take care of the following issue: +This is a quick-fix release to take care of the following issues: * Fixed a probably rare, but fatal bug on OSX when calling certain overloaded virtual methods with implementations in Python. -* Reverted the change that loads up install_requires from the contents of - requirements.txt. Split the requirements.txt file into one for install and one - for development. +* Fixed char pointers in generated stub code to have a valid + pointer value. + +* Reverted the change that loads up install_requires from the + contents of requirements.txt. Split the requirements.txt file + into one for install and one for development. diff --git a/packaging/HOWTO-Release.rst b/packaging/HOWTO-Release.rst index 519a1150..0109247e 100644 --- a/packaging/HOWTO-Release.rst +++ b/packaging/HOWTO-Release.rst @@ -62,6 +62,14 @@ HOWTO Release wxPython Phoenix TODO: Automate this! Go to the site and unpack the new docs into the document root. + cd domains/docs.wxpython.org/htdocs + mkdir {OLD_VERSION} + mv .buildinfo [_a-z]* {OLD_VERSION} + tar xzvf ../tmp/wxPython-docs-* + mv wxPython-docs-*/docs/html/* . + mv wxPython-docs-*/docs/html/.buildinfo . + rm -r wxPython-docs-* + 15. Upload the docs, demos and pdb archive files to extras.wxpython.org/wxPython4/extras/:: VERSION={current release version number}