Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 03:50:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set the version number to 4.0.0 and update comments and other text about not keeping in sync with wxWidgets version anymore.

Browse Source
This commit is contained in:
Robin Dunn
2017-04-07 12:24:36 -07:00
parent 9754a8e15a
commit f4e2104adc
4 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
buildtools/version.py
View File

@@ -2,7 +2,7 @@
# Name: buildtools.version # Name: buildtools.version
# Purpose: wxPython project name and version numbers used in the # Purpose: wxPython project name and version numbers used in the
# build. This can be considered the master copy of the # build. This can be considered the master copy of the
# version digits. # version digits and project name.
# #
# Author: Robin Dunn # Author: Robin Dunn
# #
@@ -11,12 +11,20 @@
# License: wxWindows License # License: wxWindows License
#---------------------------------------------------------------------- #----------------------------------------------------------------------
PROJECT_NAME = 'wxPython_Phoenix' # Master copy of the project name
PROJECT_NAME = 'wxPython'
VER_MAJOR = 3 # Matches wxWidgets MAJOR version number
VER_MINOR = 0 # Matches wxWidgets MINOR version number # The version numbers for wxPython are no longer kept in sync with the
VER_RELEASE = 4 # wxPython RELEASE number for the given wxWidgets # wxWidgets version number. In the past the common version number was used to
# MAJOR.MINOR version. # indicate which version of wxWidgets should be used for the wxPython build.
# Now wxWidgets is a git submodule, and the linked version is included in the
# wxPython source tarball. That said, we should still bump up the MAJOR and
# MINOR numbers each time there is a corresponding bump in the wxWidgets
# version numbers.
VER_MAJOR = 4
VER_MINOR = 0
VER_RELEASE = 0
VER_FLAGS = "a1" # wxPython release flags VER_FLAGS = "a1" # wxPython release flags

2
demo/version.py
View File

@@ -1,3 +1,3 @@
# This file was generated by Phoenix's wscript. # This file was generated by Phoenix's wscript.
VERSION_STRING = '3.0.4a1' VERSION_STRING = '4.0.0a1'

27
docs/MigrationGuide.rst
View File

@@ -22,21 +22,20 @@ should then be able to work out the details for themselves.
Version Numbers Version Numbers
--------------- ---------------
Classic wxPython used version numbers with 4 components, in order to be able The version numbers for wxPython are no longer kept in sync with the wxWidgets
to specify the exact version of wxWidgets used (3 version number components) version number. In the past the common version number was used to indicate
and an additional component to allow for multiple wxPython releases for each exactly which version of wxWidgets should be used for the wxPython build. Now
wxWidgets release. While this version numbering works okay and solves a wxWidgets is a git submodule, and the linked version is included in the
specific need that wxPython had, it does not follow the common version wxPython source tarball there is no longer any need to use the matching
numbering pattern that probably 99% of other software packages use and so it version numbers to implicitly specify the version of the wxWidgets source to
is non-intuitive for most users. use.
So Phoenix will be moving to a 3 component version number, where the first 2 This means that wxPython can go back to a 3-component version number and follow
components match the MAJOR.MINOR version of wxWidgets being used, and the 3rd the common conventions used by 99% of the other software projects out there.
component of the version number is used to indicate the release of wxPython The 3 components are commonly called MAJOR, MINOR and RELEASE. Since wxPython
Phoenix using that version of wxWidgets. It is felt that matching the 3rd Phoenix is a major upgrade over wxPython Classic then we will start out with a
component of the wxWidgets is no longer as important as it was in the past, new MAJOR version number to help communicate that this isn't just a little
because the wxWidgets source is being included with the Phoenix source, so update from previous releases.
matching exact versions of the two packages by hand is no longer needed.
Additional flags will be appended to the version number in a manner that is Additional flags will be appended to the version number in a manner that is
compliant with Python's PEP-440_. This includes syntax for alpha, beta, compliant with Python's PEP-440_. This includes syntax for alpha, beta,

5
src/core_ex.py
View File

@@ -1,13 +1,10 @@
import sys as _sys import sys as _sys
# Load version numbers from __version__... Ensure that major and minor # Load version numbers from __version__ and some other initialization tasks...
# versions are the same for both wxPython and wxWidgets.
if 'wxEVT_NULL' in dir(): if 'wxEVT_NULL' in dir():
from wx.__version__ import * from wx.__version__ import *
import wx._core import wx._core
__version__ = VERSION_STRING __version__ = VERSION_STRING
assert MAJOR_VERSION == wx._core.MAJOR_VERSION, "wxPython/wxWidgets version mismatch"
assert MINOR_VERSION == wx._core.MINOR_VERSION, "wxPython/wxWidgets version mismatch"
# Register a function to be called when Python terminates that will clean # Register a function to be called when Python terminates that will clean
# up and release all system resources that wxWidgets allocated. # up and release all system resources that wxWidgets allocated.