diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-04-11 23:59:42 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-04-11 23:59:42 (GMT) |
| commit | 7819d4c757bba420ec4b96251c188f7665a49369 (patch) | |
| tree | ab4a9ca7edf1a01a6dede1981dada9af4e3c6433 /site_scons | |
| parent | a9ab8cae92f95e7410cb534020ff03e15c753f9e (diff) | |
| download | SCons-7819d4c757bba420ec4b96251c188f7665a49369.zip SCons-7819d4c757bba420ec4b96251c188f7665a49369.tar.gz SCons-7819d4c757bba420ec4b96251c188f7665a49369.tar.bz2 | |
Address github review notes and sider issues
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/BuildCommandLine.py | 9 | ||||
| -rw-r--r-- | site_scons/epydoc.py | 2 | ||||
| -rw-r--r-- | site_scons/site_init.py | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/site_scons/BuildCommandLine.py b/site_scons/BuildCommandLine.py index 4694472..b8c7d63 100644 --- a/site_scons/BuildCommandLine.py +++ b/site_scons/BuildCommandLine.py @@ -102,25 +102,28 @@ class BuildCommandLine(object): self.revision = ARGUMENTS.get('REVISION', '') - def generate_build_id(revision): + def _generate_build_id(revision): return revision + generate_build_id=_generate_build_id + if not self.revision and BuildCommandLine.git: with os.popen("%s rev-parse HEAD 2> /dev/null" % BuildCommandLine.git, "r") as p: self.git_hash = p.read().strip() - def generate_build_id(revision): + def _generate_build_id_git(revision): result = self.git_hash if [l for l in self.git_status_lines if 'modified' in l]: result = result + '[MODIFIED]' return result + generate_build_id = _generate_build_id_git self.revision = self.git_hash self.checkpoint = ARGUMENTS.get('CHECKPOINT', '') if self.checkpoint: if self.checkpoint == 'd': - cself.heckpoint = time.strftime('%Y%m%d', time.localtime(time.time())) + self.checkpoint = time.strftime('%Y%m%d', time.localtime(time.time())) elif self.checkpoint == 'r': self.checkpoint = 'r' + self.revision self.version = self.version + '.beta.' + self.checkpoint diff --git a/site_scons/epydoc.py b/site_scons/epydoc.py index da74d9c..3d6e5de 100644 --- a/site_scons/epydoc.py +++ b/site_scons/epydoc.py @@ -53,7 +53,7 @@ if not epydoc_cli: from epydoc.docbuilder import build_doc_index from epydoc.docwriter.html import HTMLWriter - from epydoc.docwriter.latex import LatexWriter + # from epydoc.docwriter.latex import LatexWriter # first arg is a list where can be names of python package dirs, # python files, object names or objects itself diff --git a/site_scons/site_init.py b/site_scons/site_init.py index 7e7c569..81c4753 100644 --- a/site_scons/site_init.py +++ b/site_scons/site_init.py @@ -1,8 +1,10 @@ +import os.path + from SConsRevision import SCons_revision from Utilities import is_windows, whereis, platform, deb_date from zip_utils import unzipit, zipit, zcat from soe_utils import soelim, soscan, soelimbuilder -from epydoc import epydoc_cli, epydoc_commands +# from epydoc import epydoc_cli, epydoc_commands from BuildCommandLine import BuildCommandLine gzip = whereis('gzip') |