diff --git a/build.py b/build.py index ea8fe910..b2c45f5d 100755 --- a/build.py +++ b/build.py @@ -1,9 +1,17 @@ #!/usr/bin/python -#--------------------------------------------------------------------------- -# This script is used to run through the commands used for the various stages -# of building Phoenix, and can also be a front-end for building wxWidgets and -# the wxPython distribution files. -#--------------------------------------------------------------------------- +#---------------------------------------------------------------------- +# Name: build.py +# Purpose: Master build controller script. +# This script is used to run through the commands used for the +# various stages of building Phoenix, and can also be a front-end +# for building wxWidgets and the wxPython distribution files. +# +# Author: Robin Dunn +# +# Created: 3-Dec-2010 +# Copyright: (c) 2010-2016 by Total Control Software +# License: wxWindows License +#---------------------------------------------------------------------- from __future__ import absolute_import diff --git a/buildtools/version.py b/buildtools/version.py index 2708b162..58d613d0 100644 --- a/buildtools/version.py +++ b/buildtools/version.py @@ -6,38 +6,44 @@ # Author: Robin Dunn # # Created: 3-Nov-2010 -# Copyright: (c) 2013 by Total Control Software +# Copyright: (c) 2010-2016 by Total Control Software # License: wxWindows License #---------------------------------------------------------------------- -VER_MAJOR = 3 # The first three must match wxWidgets -VER_MINOR = 0 -VER_RELEASE = 3 +VER_MAJOR = 3 # Matches wxWidgets MAJOR version number +VER_MINOR = 0 # Matches wxWidgets MINOR version number +VER_RELEASE = 3 # wxPython RELEASE number for the given wxWidgets + # MAJOR.MINOR version. + VER_FLAGS = "" # wxPython release flags -# Set the VER_FLAGS component according to the following patterns. These -# should help us to better conform to the setuptools and/or PEP-0386 notions -# of version numbers. +# The VER_FLAGS value is appended to the version number constructed from first +# 3 components and should be set according to the following patterns. These +# should help us to better follow the PEP-0440 notions of version numbers, +# where public version identifiers are supposed to conform to the following +# scheme: +# +# [N!]N(.N)*[{a|b|rc}N][.postN][.devN] +# # # "" for final release builds # -# "-1" for numbered post releases, such as when there are -# additional wxPython releases for the same wxWidgets -# release. TBD: use - or .post or ? +# "aN" for official alpha releases +# "bN" for official beta releases +# "rcN" for release candidate releases +# +# ".postN" for numbered post releases, such as when there are +# minor packaging or documentation issues that can be fixed +# with no code changes. +# +# ".postNaN" for an alpha (or beta or rc) build of a numbered post +# release # # ".dev12345" for daily snapshot builds, by default this is automatically # pulled from the REV.txt file made by the setrev command, # if it exists, and is appended to VER_FLAGS # -# "a1" for official alpha releases -# "b1" for beta releases -# "rc1" for release candidate releases -# -# "-1a1" For alpha releases of a numbered post release, (betas, etc. -# of numbered post releases can be done the same way) # # See also: -# -# http://pythonhosted.org/setuptools/setuptools.html -# http://www.python.org/dev/peps/pep-0386/ +# http://www.python.org/dev/peps/pep-0440/ diff --git a/setup.py b/setup.py index ef202f7a..d4b9172d 100644 --- a/setup.py +++ b/setup.py @@ -5,19 +5,13 @@ # Author: Robin Dunn # # Created: 3-Nov-2010 -# Copyright: (c) 2013 by Total Control Software +# Copyright: (c) 2010-2016 by Total Control Software # License: wxWindows License #---------------------------------------------------------------------- import sys, os import glob -try: - import setuptools -except ImportError: - from ez_setup import use_setuptools - use_setuptools() - from setuptools import setup, Extension, find_packages from distutils.command.build import build as orig_build from setuptools.command.install import install as orig_install @@ -36,7 +30,7 @@ from buildtools.config import Config, msg, opj, runcmd, canGetSOName, getSOName #---------------------------------------------------------------------- NAME = "wxPython_Phoenix" -DESCRIPTION = "Cross platform GUI toolkit for Python" +DESCRIPTION = "Cross platform GUI toolkit for Python, Phoenix verison" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " URL = "http://wxPython.org/" @@ -56,7 +50,7 @@ very little (if any) platform specific code. """ CLASSIFIERS = """\ -Development Status :: 6 - Mature +Development Status :: 3 - Alpha Environment :: MacOS X :: Cocoa Environment :: Win32 (MS Windows) Environment :: X11 Applications :: GTK @@ -67,7 +61,10 @@ Operating System :: Microsoft :: Windows :: Windows XP Operating System :: Microsoft :: Windows :: Windows Vista Operating System :: Microsoft :: Windows :: Windows 7 Operating System :: POSIX -Programming Language :: Python +Programming Language :: Python :: 2.7 +Programming Language :: Python :: 3.3 +Programming Language :: Python :: 3.4 +Programming Language :: Python :: 3.5 Topic :: Software Development :: User Interfaces """ @@ -80,7 +77,7 @@ isDarwin = sys.platform == "darwin" class wx_build(orig_build): """ - Delgate to build.py for doing the actual build, (including wxWidgets) + Delegate to build.py for doing the actual build, (including wxWidgets) instead of letting distutils do it all. """ user_options = [ @@ -124,7 +121,7 @@ def _cleanup_symlinks(cmd): # left in. # # TODO: can eggs have post-install scripts that would allow us to - # restore the links? + # restore the links? No. # build_lib = cmd.get_finalized_command('build').build_lib build_lib = opj(build_lib, 'wx') @@ -186,7 +183,7 @@ if haveWheel: class wx_bdist_wheel(orig_bdist_wheel): def finalize_options(self): # Do a bit of monkey-patching to let bdist_wheel know that there - # really are extension modules in this build, eventhough they are + # really are extension modules in this build, even though they are # not built here. def _has_ext_modules(self): return True