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

CHANGES.rst

@@ -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.
 
 The release version of the documentation can now be found at
-http://pythonhosted.org/wxPython. The documentation created during the
-snapshot builds is still located at https://wxpython.org/Phoenix/docs/html/
+https://docs.wxPython.org/ The documentation created during the
+snapshot builds is still located at https://wxPython.org/Phoenix/docs/html/
 
 
 

build.py

@@ -1016,36 +1016,36 @@ def cmd_bdist_docs(options, args):
     msg('Documentation tarball built at %s' % tarfilename)
 
 
-    # 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
-    # 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
-    # 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
-    # in this case because we don't need to rewrite the pathnames in the
-    # archive.
-    if options.release:
-        msg("Archiving wxPython Phoenix documentation for pythonhosted.org...")
-        rootname = "%s-docs-pythonhosted-%s" % (baseName, cfg.VERSION)
-        zipfilename = "dist/%s.zip" % rootname
-
-        if os.path.exists(zipfilename):
-            os.remove(zipfilename)
-
-        # with zipfile.ZipFile(zipfilename, 'w', zipfile.ZIP_DEFLATED) as zip:
-        #     pwd2 = pushDir('docs/html')
-
-        zipfilename = shutil.make_archive(base_name=os.path.splitext(zipfilename)[0],
-                                          format="zip",
-                                          root_dir="docs/html")
-        zipfilename = os.path.relpath(zipfilename)
-        zipfilename = zipfilename.replace('\\', '/')
-
-        if options.upload:
-            uploadPackage(zipfilename, options, keep=5,
-                          mask='%s-docs-pythonhosted-%s*' % (baseName, cfg.VER_MAJOR))
-
-        msg('Pythonhosted zip file built at %s' % zipfilename)
+    # # 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
+    # # 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
+    # # 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
+    # # in this case because we don't need to rewrite the pathnames in the
+    # # archive.
+    # if options.release:
+    #     msg("Archiving wxPython Phoenix documentation for pythonhosted.org...")
+    #     rootname = "%s-docs-pythonhosted-%s" % (baseName, cfg.VERSION)
+    #     zipfilename = "dist/%s.zip" % rootname
+    #
+    #     if os.path.exists(zipfilename):
+    #         os.remove(zipfilename)
+    #
+    #     # with zipfile.ZipFile(zipfilename, 'w', zipfile.ZIP_DEFLATED) as zip:
+    #     #     pwd2 = pushDir('docs/html')
+    #
+    #     zipfilename = shutil.make_archive(base_name=os.path.splitext(zipfilename)[0],
+    #                                       format="zip",
+    #                                       root_dir="docs/html")
+    #     zipfilename = os.path.relpath(zipfilename)
+    #     zipfilename = zipfilename.replace('\\', '/')
+    #
+    #     if options.upload:
+    #         uploadPackage(zipfilename, options, keep=5,
+    #                       mask='%s-docs-pythonhosted-%s*' % (baseName, cfg.VER_MAJOR))
+    #
+    #     msg('Pythonhosted zip file built at %s' % zipfilename)
 
 
 

buildbot/master.cfg

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

packaging/ANNOUNCE.txt

@@ -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.
 
 The release version of the documentation can now be found at
-http://pythonhosted.org/wxPython. The documentation created during the
-snapshot builds is still located at https://wxpython.org/Phoenix/docs/html/
+https://docs.wxPython.org/ The documentation created during the
+snapshot builds is still located at https://wxPython.org/Phoenix/docs/html/
 
 
 

packaging/HOWTO-Release.rst

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

setup.py

@@ -27,6 +27,10 @@ from buildtools.config import Config, msg, opj, runcmd, canGetSOName, getSOName
 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
@@ -52,14 +56,15 @@ Unix systems, with a native look and feel and requiring very little (if any)
 platform specific code.
 
 For more information please refer to the
-`README file <https://github.com/wxWidgets/Phoenix/blob/master/README.rst>`_,
-the `Migration Guide <https://wxpython.org/Phoenix/docs/html/MigrationGuide.html>`_,
-or the `wxPython API documentation <https://wxpython.org/Phoenix/docs/html/main.html>`_.
+`README file <https://github.com/wxWidgets/Phoenix/blob/wxPython-{version}/README.rst>`_,
+the `Migration Guide <{docs_base}/MigrationGuide.html>`_,
+or the `wxPython API documentation <{docs_base}/main.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 
 `here <https://wxpython.org/Phoenix/release-extras/>`_.
-"""
+""".format(version=cfg.VERSION, docs_base=DOCS_BASE)
+
 
 
 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')]
 
 ENTRY_POINTS = {