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

The pythonhosted.org site is terribly slow. Put the docs at docs.wxpython.org instead.

Browse Source
This commit is contained in:
Robin Dunn
2017-06-03 18:03:21 -07:00
parent 72e86943ad
commit 676db7b5d1
6 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.rst
View File

@@ -41,8 +41,8 @@ Fix for missing checkbox images in CheckListCtrlMixin on Linux and OSX.
Fix another crashing problem in propgrid, and a few other propgrid issues too. Fix another crashing problem in propgrid, and a few other propgrid issues too.
The release version of the documentation can now be found at The release version of the documentation can now be found at
http://pythonhosted.org/wxPython. The documentation created during the https://docs.wxPython.org/ The documentation created during the
snapshot builds is still located at https://wxpython.org/Phoenix/docs/html/ snapshot builds is still located at https://wxPython.org/Phoenix/docs/html/

60
build.py
View File

@@ -1016,36 +1016,36 @@ def cmd_bdist_docs(options, args):
msg('Documentation tarball built at %s' % tarfilename) msg('Documentation tarball built at %s' % tarfilename)
# pythonhosted.org can host the wxPython documentation for us, so let's # # pythonhosted.org can host the wxPython documentation for us, so let's
# use it for the docs associated with the latest release of wxPython. It # # use it for the docs associated with the latest release of wxPython. It
# requires that the docs be in a .zip file with an index.html file at the # # requires that the docs be in a .zip file with an index.html file at the
# top level. To build this we'll just need to do like the above tarball # # top level. To build this we'll just need to do like the above tarball
# code, except add the files from within the docs/html folder so they will # # code, except add the files from within the docs/html folder so they will
# all be at the top level of the archive. shutil.make_archive can be used # # all be at the top level of the archive. shutil.make_archive can be used
# in this case because we don't need to rewrite the pathnames in the # # in this case because we don't need to rewrite the pathnames in the
# archive. # # archive.
if options.release: # if options.release:
msg("Archiving wxPython Phoenix documentation for pythonhosted.org...") # msg("Archiving wxPython Phoenix documentation for pythonhosted.org...")
rootname = "%s-docs-pythonhosted-%s" % (baseName, cfg.VERSION) # rootname = "%s-docs-pythonhosted-%s" % (baseName, cfg.VERSION)
zipfilename = "dist/%s.zip" % rootname # zipfilename = "dist/%s.zip" % rootname
#
if os.path.exists(zipfilename): # if os.path.exists(zipfilename):
os.remove(zipfilename) # os.remove(zipfilename)
#
# with zipfile.ZipFile(zipfilename, 'w', zipfile.ZIP_DEFLATED) as zip: # # with zipfile.ZipFile(zipfilename, 'w', zipfile.ZIP_DEFLATED) as zip:
# pwd2 = pushDir('docs/html') # # pwd2 = pushDir('docs/html')
#
zipfilename = shutil.make_archive(base_name=os.path.splitext(zipfilename)[0], # zipfilename = shutil.make_archive(base_name=os.path.splitext(zipfilename)[0],
format="zip", # format="zip",
root_dir="docs/html") # root_dir="docs/html")
zipfilename = os.path.relpath(zipfilename) # zipfilename = os.path.relpath(zipfilename)
zipfilename = zipfilename.replace('\\', '/') # zipfilename = zipfilename.replace('\\', '/')
#
if options.upload: # if options.upload:
uploadPackage(zipfilename, options, keep=5, # uploadPackage(zipfilename, options, keep=5,
mask='%s-docs-pythonhosted-%s*' % (baseName, cfg.VER_MAJOR)) # mask='%s-docs-pythonhosted-%s*' % (baseName, cfg.VER_MAJOR))
#
msg('Pythonhosted zip file built at %s' % zipfilename) # msg('Pythonhosted zip file built at %s' % zipfilename)

8
buildbot/master.cfg
View File

@@ -429,11 +429,11 @@ authz_cfg = authz.Authz(
auth = BasicAuth(bbpasswd.USERS), auth = BasicAuth(bbpasswd.USERS),
forceBuild = 'auth', forceBuild = 'auth',
forceAllBuilds = 'auth', forceAllBuilds = 'auth',
#gracefulShutdown = True, gracefulShutdown = True,
#pingBuilder = True, #pingBuilder = True,
#stopBuild = True, stopBuild = True,
#stopAllBuilds = True, stopAllBuilds = True,
#cancelPendingBuild = True, cancelPendingBuild = True,
) )
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg, c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg,

4
packaging/ANNOUNCE.txt
View File

@@ -45,8 +45,8 @@ Fix for missing checkbox images in CheckListCtrlMixin on Linux and OSX.
Fix another crashing problem in propgrid, and a few other propgrid issues too. Fix another crashing problem in propgrid, and a few other propgrid issues too.
The release version of the documentation can now be found at The release version of the documentation can now be found at
http://pythonhosted.org/wxPython. The documentation created during the https://docs.wxPython.org/ The documentation created during the
snapshot builds is still located at https://wxpython.org/Phoenix/docs/html/ snapshot builds is still located at https://wxPython.org/Phoenix/docs/html/

8
packaging/HOWTO-Release.rst
View File

@@ -53,8 +53,12 @@ HOWTO Release wxPython Phoenix
(Twine doesn't know what to do with the docs and other files so they need (Twine doesn't know what to do with the docs and other files so they need
to be excluded by the wildcard.) to be excluded by the wildcard.)
14. Upload the wxPython-docs-pythonhosted*.zip documentation file using the 14. Upload the wxPython-docs-*.tar.gz documentation file to docs.wxpython.org::
form on PyPI. Remove the local copy of the file before the next step.
scp wxPython-docs-4.0.0a3.tar.gz wxpython-docs:wxpython-docs/tmp
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 wxpython.org/Phoenix/release-extras/::

16
setup.py
View File

@@ -27,6 +27,10 @@ from buildtools.config import Config, msg, opj, runcmd, canGetSOName, getSOName
import buildtools.version as version import buildtools.version as version
# Create a buildtools.config.Configuration object
cfg = Config(noWxConfig=True)
DOCS_BASE='http://docs.wxPython.org'
#---------------------------------------------------------------------- #----------------------------------------------------------------------
NAME = version.PROJECT_NAME NAME = version.PROJECT_NAME
@@ -52,14 +56,15 @@ Unix systems, with a native look and feel and requiring very little (if any)
platform specific code. platform specific code.
For more information please refer to the For more information please refer to the
`README file <https://github.com/wxWidgets/Phoenix/blob/master/README.rst>`_, `README file <https://github.com/wxWidgets/Phoenix/blob/wxPython-{version}/README.rst>`_,
the `Migration Guide <https://wxpython.org/Phoenix/docs/html/MigrationGuide.html>`_, the `Migration Guide <{docs_base}/MigrationGuide.html>`_,
or the `wxPython API documentation <https://wxpython.org/Phoenix/docs/html/main.html>`_. or the `wxPython API documentation <{docs_base}/main.html>`_.
Archive files containing a copy of the wxPython documentation, the demo and 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 samples, and also a set of MSVC .pdb files for Windows are available
`here <https://wxpython.org/Phoenix/release-extras/>`_. `here <https://wxpython.org/Phoenix/release-extras/>`_.
""" """.format(version=cfg.VERSION, docs_base=DOCS_BASE)
CLASSIFIERS = """\ CLASSIFIERS = """\
@@ -301,9 +306,6 @@ distutils.dir_util.copy_tree = wx_copy_tree
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Create a buildtools.config.Configuration object
cfg = Config(noWxConfig=True)
WX_PKGLIST = [cfg.PKGDIR] + [cfg.PKGDIR + '.' + pkg for pkg in find_packages('wx')] WX_PKGLIST = [cfg.PKGDIR] + [cfg.PKGDIR + '.' + pkg for pkg in find_packages('wx')]
ENTRY_POINTS = { ENTRY_POINTS = {