diff --git a/CHANGES.rst b/CHANGES.rst index f8f2af68..b495ba79 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,44 +9,55 @@ wxPython Changelog ================== -4.0.0a4 +4.0.0b1 ------- -* (not yet released) +* 22-July-2017 -Various little tweaks and fixes in some of the demo samples. +PyPI: https://pypi.python.org/pypi/wxPython/4.0.0b1 +Extras: https://extras.wxPython.org/wxPython4/extras/ -Fixes in wx.lib.imagebrowser so it looks and acts better on OSX. +Changes in this release include the following: -Fixed problem due to wxModules not being initialized when non-core extensions -are imported. +* Various little tweaks and fixes in some of the demo samples. -Fixed issue in wx.TreeItemId comparison methods affecting PyCrust and other -tools. +* Fixes in wx.lib.imagebrowser so it looks and acts better on OSX. -Restore the simplified names for the wxGridSelectionModes enum that were -present in Classic. +* Fixed problem due to wxModules not being initialized when non-core + extensions are imported. -Add accessors for the internal widgets in the wx.EditableListBox. +* Fixed issue in wx.TreeItemId comparison methods affecting PyCrust and + other tools. -Fixes in wx.lib.eventwatcher to avoid deprecated methods and other Phoenix -related changes. +* Restore the simplified names for the wxGridSelectionModes enum that were + present in Classic. -Correctly transfer ownership of the input stream in wx.FSFile. +* Add accessors for the internal widgets in the wx.EditableListBox. -Ensure the license files are getting into the source tarball and the binary -wheel files. +* Fixes in wx.lib.eventwatcher to avoid deprecated methods and other Phoenix + related changes. -Add wrappers for the classes derived from wxImageHandler. +* Correctly transfer ownership of the input stream in wx.FSFile. -Fix wx.lib.plot.polyline to not attempt to draw the spline if there are less -than 3 points. +* Ensure the license files are getting into the source tarball and the + binary wheel files. -Transfer the ownership of the prop arg in wx.propgrid.PGProperty.AddChild and -AddPrivateChild. Various other fixes in wx.propgrid classes for backwards -compatibility and to fix problems caused by mismatches between customizations -that were done for Classic and how Phoenix does things by default. +* Add wrappers for the classes derived from wxImageHandler. +* Fix wx.lib.plot.polyline to not attempt to draw the spline if there are + less than 3 points. +* Transfer the ownership of the prop arg in wx.propgrid.PGProperty.AddChild + and AddPrivateChild. Various other fixes in wx.propgrid classes for + backwards compatibility and to fix problems caused by mismatches between + customizations that were done for Classic and how Phoenix does things by + default. Also solved some problems in the PropertyGrid sample in the demo. + +* Add missing HtmlCell.FindCellByPos. + +* Enhance the DLG_UNIT convenience function such that if something other than + a wx.Point or wx.Size was passed in then the return value will be a tuple. + This eliminates some surprises that are possible due to auto-conversion of + tuples to points or sizes. diff --git a/buildtools/version.py b/buildtools/version.py index 06d64337..3d336564 100644 --- a/buildtools/version.py +++ b/buildtools/version.py @@ -26,7 +26,7 @@ VER_MAJOR = 4 VER_MINOR = 0 VER_RELEASE = 0 -VER_FLAGS = "a4" # wxPython release flags +VER_FLAGS = "b2" # 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 fadab3e4..4164c124 100644 --- a/demo/version.py +++ b/demo/version.py @@ -1,3 +1,3 @@ # This file was generated by Phoenix's wscript. -VERSION_STRING = '4.0.0a4' +VERSION_STRING = '4.0.0b2' diff --git a/packaging/ANNOUNCE.txt b/packaging/ANNOUNCE.txt index 300dfe73..5491d0df 100644 --- a/packaging/ANNOUNCE.txt +++ b/packaging/ANNOUNCE.txt @@ -8,51 +8,57 @@ ]] -Announcing wxPython 4.0.0a3 +Announcing wxPython 4.0.0b1 =========================== -https://pypi.python.org/pypi/wxPython/4.0.0a3 -Changes -------- +PyPI: https://pypi.python.org/pypi/wxPython/4.0.0b1 +Extras: https://extras.wxPython.org/wxPython4/extras/ -Fixed a few cases where the GIL was not acquired before building -tuples of values. The problems associated with this (hangs or crashes) -were sporadic and seemingly random, and did not appear until there was -a background thread that was very busy. Running under a debug build of -Python revealed the problem almost immediately. Yay Python! +Changes in this release include the following: -Return an integer value from wx.DC.GetHandle instead of a wrapped -voidptr object, similar to how it is done for wx.Window.GetHandle. +* Various little tweaks and fixes in some of the demo samples. -Make wx.TreeItemID hashable, with meaningful hash value and equality -operators, so it can be used as a dictionary key in Py3. +* Fixes in wx.lib.imagebrowser so it looks and acts better on OSX. -Fixed crash in wx.grid.GridTable.GetAttr, and potentially other cases -of classes derived from wx.RefCounter. +* Fixed problem due to wxModules not being initialized when non-core + extensions are imported. -Add ShowPage and IsRunning methods to wx.adv.Wizard. +* Fixed issue in wx.TreeItemId comparison methods affecting PyCrust and + other tools. -Fixed various GTK specific bugs and other cleanup in wx.lib.agw.aui. +* Restore the simplified names for the wxGridSelectionModes enum that were + present in Classic. -Updated to SIP 4.19.2 +* Add accessors for the internal widgets in the wx.EditableListBox. -Restored builders for Python 3.4 to the buildbot. +* Fixes in wx.lib.eventwatcher to avoid deprecated methods and other Phoenix + related changes. -Restore the wrappers for GetPaperSize and SetPaperSize to -wx.PrintData. +* Correctly transfer ownership of the input stream in wx.FSFile. -Fix crashing problem when a wx.TreeItemId was compared with None. +* Ensure the license files are getting into the source tarball and the + binary wheel files. -Fix for missing checkbox images in CheckListCtrlMixin on Linux and -OSX. +* Add wrappers for the classes derived from wxImageHandler. + +* Fix wx.lib.plot.polyline to not attempt to draw the spline if there are + less than 3 points. + +* Transfer the ownership of the prop arg in wx.propgrid.PGProperty.AddChild + and AddPrivateChild. Various other fixes in wx.propgrid classes for + backwards compatibility and to fix problems caused by mismatches between + customizations that were done for Classic and how Phoenix does things by + default. Also solved some problems in the PropertyGrid sample in the demo. + +* Add missing HtmlCell.FindCellByPos. + +* Enhance the DLG_UNIT convenience function such that if something other than + a wx.Point or wx.Size was passed in then the return value will be a tuple. + This eliminates some surprises that are possible due to auto-conversion of + tuples to points or sizes. -Fix another crashing problem in propgrid, and a few other propgrid -issues too. -The release version of the documentation can now be found at -https://docs.wxPython.org/ The documentation created during the -snapshot builds is still located at https://wxPython.org/Phoenix/docs/html diff --git a/packaging/HOWTO-Release.rst b/packaging/HOWTO-Release.rst index 516b462f..c3257983 100644 --- a/packaging/HOWTO-Release.rst +++ b/packaging/HOWTO-Release.rst @@ -60,26 +60,35 @@ HOWTO Release wxPython Phoenix TODO: Automate this! Go to the site and unpack the new docs into the document root. -15. Upload the docs, demos and pdb archive files to wxpython.org/Phoenix/release-extras/:: +15. Upload the docs, demos and pdb archive files to extras.wxpython.org/wxPython4/extras/:: VERSION={current release version number} - ssh wxpython-extras "mkdir -p wxpython-extras/$VERSION" - scp wxPython-[^0-9]* wxpython-extras:wxpython-extras/$VERSION + ssh wxpython-extras "mkdir -p wxpython-extras/htdocs/wxPython4/extras/$VERSION" + scp wxPython-[^0-9]* wxpython-extras:wxpython-extras/htdocs/wxPython4/extras/$VERSION 16. Upload the Linux wheels:: - scp -r linux wxpython-extras:wxpython-extras/ + scp -r linux wxpython-extras:wxpython-extras/htdocs/wxPython4/extras/ -17. Tag the released revision in git, using a name like wxPython-4.0.0 (using +17. Save a copy of everything to the NAS:: + + mkdir /stuff/Development/wxPython/wxPython4/extras/$VERSION + cp -v wxPython-[^0-9]* /stuff/Development/wxPython/wxPython4/extras/$VERSION + cp -v wxPython-4* /stuff/Development/wxPython/wxPython4/pypi + cp -rv linux /stuff/Development/wxPython/wxPython4/extras + +18. Tag the released revision in git, using a name like wxPython-4.0.0 (using the actual version number of course.) Push the tag to all remotes. -18. Bump the version numbers in buildtools/version.py appropriately for the +19. Bump the version numbers in buildtools/version.py appropriately for the next anticipated release, so future snapshot builds will be recognized as pre-release development versions for the next official release, not the one just completed. -19. If making an announcement about this release, (I think it's okay not to +20. If making an announcement about this release, (I think it's okay not to for minor releases or smallish bug fixes,) send the text in packaging/ANNOUNCE.txt to the email addresses listed at the top of the file. +21. Add a news post to the wxPython site about the release. + diff --git a/setup.py b/setup.py index 4adad201..cda4511f 100644 --- a/setup.py +++ b/setup.py @@ -36,10 +36,8 @@ DOCS_BASE='http://docs.wxPython.org' NAME = version.PROJECT_NAME DESCRIPTION = "Cross platform GUI toolkit for Python, \"Phoenix\" version" AUTHOR = "Robin Dunn" -AUTHOR_EMAIL = "Robin Dunn " +AUTHOR_EMAIL = "robin@alldunn.com" URL = "http://wxPython.org/" -#DOWNLOAD_URL = "http://wxPython.org/download.php" -#DOWNLOAD_URL = "http://wxpython.org/Phoenix/snapshot-builds/" DOWNLOAD_URL = "https://pypi.python.org/pypi/{}".format(NAME) LICENSE = "wxWindows Library License (https://opensource.org/licenses/wxwindows.php)" PLATFORMS = "WIN32,WIN64,OSX,POSIX" @@ -61,14 +59,14 @@ the `Migration Guide <{docs_base}/MigrationGuide.html>`_, or the `wxPython API documentation <{docs_base}/index.html>`_. Archive files containing a copy of the wxPython documentation, the demo and -samples, and also a set of MSVC .pdb files for Windows are available at sourceforge, -`here `_. +samples, and also a set of MSVC .pdb files for Windows are available +`here `_. """.format(version=cfg.VERSION, docs_base=DOCS_BASE) CLASSIFIERS = """\ -Development Status :: 3 - Alpha +Development Status :: 4 - Beta Environment :: MacOS X :: Cocoa Environment :: Win32 (MS Windows) Environment :: X11 Applications :: GTK