Revert "gslab-python/#28 merge commit"

This reverts commit bb30bc8.

SConstruct

@@ -1,9 +1,5 @@
 # Preliminaries
 import os
-import sys
-import gslab_scons.builders as build
-import gslab_scons.log as log
-import atexit
 
 # Test for proper prerequisites and setup
 from setup import setup_test
@@ -12,9 +8,7 @@ import gslab_scons
 import yaml
 
 # Start log
-mode = ARGUMENTS.get('mode', 'develop') # Gets mode; defaults to 'develop'
-vers = ARGUMENTS.get('version', '') # Gets release version; defaults to ''
-log.start_log(mode, vers)
+gslab_scons.start_log() 
 
 # Defines environment
 env = Environment(ENV = {'PATH' : os.environ['PATH']}, 
@@ -54,5 +48,3 @@ Depends(finish_command, BUILD_TARGETS)
 env.AlwaysBuild(finish_command)
 if 'state_of_repo.log' not in BUILD_TARGETS: 
     BUILD_TARGETS.append('state_of_repo.log')
-
-atexit.register(log.end_log)

release/paper/sconscript.log

@@ -1,9 +1,17 @@
-*** Builder log created: {2017-02-17 16:57:01} 
-*** Builder log completed: {2017-02-17 16:57:01} 
- This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
+Log created:    2017-02-06 17:13:52
+Log completed:  2017-02-06 17:13:54
+
+This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
  restricted \write18 enabled.
 entering extended mode
-(./text.tex
+(./paper.tex
+LaTeX2e <2016/03/31>
+Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
+
+This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
+ restricted \write18 enabled.
+entering extended mode
+(./paper.tex
 LaTeX2e <2016/03/31>
 Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
 

release/talk/sconscript.log

@@ -1,6 +1,7 @@
-*** Builder log created: {2017-02-17 16:57:01} 
-*** Builder log completed: {2017-02-17 16:57:03} 
- This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
+Log created:    2017-02-06 17:13:54
+Log completed:  2017-02-06 17:13:57
+
+This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
  restricted \write18 enabled.
 entering extended mode
 (./slides.tex

sconstruct.log

@@ -1,133 +1,11 @@
-*** New build: {2017-02-17 16:56:54} ***
 scons: done reading SConscript files.
 scons: Building targets ...
 build_stata(["build/analysis/plot.eps", "build/analysis/table.txt"], ["source/analysis/analysis.do", "build/data/data.txt"])
 build_tables(["build/tables/table.lyx"], ["source/tables/table.lyx", "build/analysis/table.txt"])
 source/tables/table.lyx filled successfully by tablefill
 build_lyx(["build/paper/paper.pdf"], ["source/paper/paper.lyx"])
-build_lyx(["build/paper/text.pdf"], ["source/paper/text.lyx"])
 build_lyx(["build/talk/slides.pdf"], ["source/talk/slides.lyx"])
 Install directory: "build/paper" as "release/paper"
 Install directory: "build/talk" as "release/talk"
 state_of_repo(["state_of_repo.log"], [])
 scons: done building targets.
-*** Build completed: {2017-02-17 16:57:03} ***
-*** Builder log created: {2017-02-17 16:57:01} 
-*** Builder log completed: {2017-02-17 16:57:03} 
- This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
- restricted \write18 enabled.
-entering extended mode
-(./slides.tex
-LaTeX2e <2016/03/31>
-Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
-
-This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
- restricted \write18 enabled.
-entering extended mode
-(./slides.tex
-LaTeX2e <2016/03/31>
-Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
-
-*** Builder log created: {2017-02-17 16:57:01} 
-*** Builder log completed: {2017-02-17 16:57:03} 
- This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
- restricted \write18 enabled.
-entering extended mode
-(./slides.tex
-LaTeX2e <2016/03/31>
-Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
-
-This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
- restricted \write18 enabled.
-entering extended mode
-(./slides.tex
-LaTeX2e <2016/03/31>
-Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
-
-*** Builder log created: {2017-02-17 16:57:01} 
-*** Builder log completed: {2017-02-17 16:57:01} 
- This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
- restricted \write18 enabled.
-entering extended mode
-(./text.tex
-LaTeX2e <2016/03/31>
-Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
-
-*** Builder log created: {2017-02-17 16:57:01} 
-*** Builder log completed: {2017-02-17 16:57:01} 
- This is pdfTeX, Version 3.14159265-2.6-1.40.17 (TeX Live 2016) (preloaded format=pdflatex)
- restricted \write18 enabled.
-entering extended mode
-(./text.tex
-LaTeX2e <2016/03/31>
-Babel <3.9r> and hyphenation patterns for 83 language(s) loaded.
-
-*** Builder log created: {2017-02-17 16:56:55} 
-*** Builder log completed: {2017-02-17 16:56:57} 
-
-  ___  ____  ____  ____  ____ (R)
- /__    /   ____/   /   ____/
-___/   /   /___/   /   /___/   14.2   Copyright 1985-2015 StataCorp LP
-  Statistics/Data Analysis            StataCorp
-                                      4905 Lakeway Drive
-     MP - Parallel Edition            College Station, Texas 77845 USA
-                                      800-STATA-PC        http://www.stata.com
-                                      979-696-4600        stata@stata.com
-                                      979-696-4601 (fax)
-
-Unlimited-user 4-core Stata network license expires 21 Jul 2017:
-       Serial number:  501409012939
-         Licensed to:  Quan Le
-                       Stanford University
-
-Notes:
-      1.  Stata is running in batch mode.
-      2.  Unicode is supported; see help unicode_advice.
-      3.  More than 2 billion observations are allowed; see help obs_advice.
-      4.  Maximum number of variables is set to 5000; see help set_maxvar.
-
-
-running /Applications/Stata/profile.do ...
-
-. do "source/analysis/analysis.do" 
-
-. version 14
-
-. clear all
-
-. set more off
-
-. 
-. 
-. program main
-  1.     yaml read YAML using constants.yaml
-  2.     yaml local build_data=YAML.build.data
-  3.     yaml local build_analysis=YAML.build.analysis
-  4. 
-.     import delimited "`build_data'/data.txt", delimiters("|") varnames(1) clear
-  5.     hist x, discrete width(0.5)
-  6.     graph export "`build_analysis'/plot.eps", replace
-  7. 
-.     sum x
-  8.     file open  outfile using "`build_analysis'/table.txt", write replace
-  9.     file write outfile "<tab:table>" _n
- 10.     file write outfile (r(mean)) _n (r(sd)) _n (r(max)) _n (r(min))
- 11.     file close outfile
- 12. end
-
-. 
-. 
-. * EXECUTE
-. main
-(1 var, 201 obs)
-(start=-10, width=.5)
-(note: file build/analysis/plot.eps not found)
-(file build/analysis/plot.eps written in EPS format)
-
-    Variable |        Obs        Mean    Std. Dev.       Min        Max
--------------+---------------------------------------------------------
-           x |        201           0    5.816786        -10         10
-(note: file build/analysis/table.txt not found)
-
-. 
-end of do-file

source/analysis/SConscript

@@ -6,4 +6,4 @@ source = env['PATHS']['source']['analysis']
 env.BuildStata(target = ['#%s/plot.eps'    % build,
                          '#%s/table.txt'   % build],
                source = ['#%s/analysis.do' % source,
-                         '#%s/data.txt'    % env['PATHS']['build']['data']])
+                         '#%s/data.txt'    % env['PATHS']['build']['data']])

source/paper/SConscript

@@ -15,4 +15,4 @@ env.BuildLyx(target = ['#%s/text.pdf' % build],
 env.BuildLyx(target = ['#%s/ondeck.pdf' % build], 
              source = ['#%s/ondeck.lyx' % source])
 
-env.Install('#release', '#%s/' % build)
+env.Install('#release', '#%s/' % build)

source/talk/SConscript

@@ -3,4 +3,4 @@ Import('env')
 env.BuildLyx(target = '#%s/slides.pdf'  % env['PATHS']['build']['talk'], 
              source = ['#%s/slides.lyx' % env['PATHS']['source']['talk']])
 
-env.Install('#release', '#%s/' % env['PATHS']['build']['talk'])
+env.Install('#release', '#%s/' % env['PATHS']['build']['talk'])