From 3fb5b6c7f220976bd89d3f2f77360c5743bd5c83 Mon Sep 17 00:00:00 2001 From: Ghislain Antony Vaillant Date: Mon, 24 Jul 2017 09:54:09 +0100 Subject: [PATCH 1/5] Add docs to the release tarball The PyPI tarball is the canonical source for building packages on Linux distributions such as Debian. It would be desirable to have the docs shipped in the sdist, so that a corresponding documentation package can be built on the Debian side. --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 41c49fb8..9a7cc9a7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,6 +7,7 @@ recursive-include wx ** recursive-include license *.txt include LICENSE.txt +graft docs recursive-exclude wx .git recursive-exclude wx *.pyc From e2d043acb513e724f131b193c52b81a5aff88bc0 Mon Sep 17 00:00:00 2001 From: Ghislain Antony Vaillant Date: Thu, 3 Aug 2017 08:34:23 +0100 Subject: [PATCH 2/5] Exclude the Sphinx build directory from sdist --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index 9a7cc9a7..0ad1c303 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,6 +8,7 @@ recursive-include wx ** recursive-include license *.txt include LICENSE.txt graft docs +prune docs/sphinx/build recursive-exclude wx .git recursive-exclude wx *.pyc From 6104c898b0d12413c74bdf7027e50317d0e95d62 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 3 Aug 2017 11:22:54 -0700 Subject: [PATCH 3/5] Add note about where the real file selection and archiving happens. --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 0ad1c303..0f8652cb 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,6 +3,8 @@ # still an easy way to specify what data files (non *.py files) should be # included in the package dirs. # +# See cmd_sdist() in build.py for the actual building of the source dist. +# recursive-include wx ** recursive-include license *.txt From 052e19116a0f751245a42e382a86ddf6e1263e6b Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 3 Aug 2017 16:41:39 -0700 Subject: [PATCH 4/5] Add the sphinx source files to the source tarball --- build.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.py b/build.py index eab9baac..c0aaaf62 100755 --- a/build.py +++ b/build.py @@ -1766,10 +1766,16 @@ def cmd_sdist(options, args): getWafCmd() copyFile('bin/waf-%s' % wafCurrentVersion, os.path.join(PDEST, 'bin')) - # and the REV.txt if there is one + # And the REV.txt if there is one if os.path.exists('REV.txt'): copyFile('REV.txt', PDEST) + # Copy the Sphinx source files in the docs tree, excluding the html and + # sphinx/build folders, if present. + shutil.rmtree(opj(PDEST, 'docs'), ignore_errors=True) + shutil.copytree('docs', opj(PDEST, 'docs'), + ignore=shutil.ignore_patterns('html', 'build', '__pycache__', 'cpp')) + # Add some extra stuff to the root folder cmd_egg_info(options, args, egg_base=PDEST) copyFile(opj(PDEST, '{}.egg-info/PKG-INFO'.format(baseName)), From 9c26b68783acf259d47abd49675dcfcbdcf9dd02 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 3 Aug 2017 16:43:22 -0700 Subject: [PATCH 5/5] Run the wxlib command for sdist builds --- buildbot/master.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildbot/master.cfg b/buildbot/master.cfg index a4f09185..53b1943e 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -213,7 +213,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): factory = BuildFactory() # Was the build started from the force build form with a "fullclean" - # property set? If so, clobber the git workspace and start fresh. + # property set? If so, fully clobber the git workspace and start fresh. cmd = ['bash', '-c', WithProperties('if [ %(fullclean:-no)s == yes ]; then rm -rf ../Phoenix; echo fully cleaned; fi'), ] @@ -226,7 +226,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): clean = '' # Start from a clean build tree for the daily "dist" builds - if buildType in ['dist', 'docs', 'vagrant']: + if buildType in ['dist', 'sdist', 'docs', 'vagrant']: mode = 'full' method = 'clobber' @@ -246,7 +246,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'): if buildType == 'sdist': cmd = 'python -u build.py %s setrev dox touch etg sip build '\ - 'sdist sdist_demo --upload' % pyVer + 'wxlib sdist sdist_demo --upload' % pyVer elif buildType == 'docs': cmd = 'python -u build.py %s setrev dox touch etg sip build wxlib ' \