From 11129ca073b4926037368d9a0bf079dc422e28f7 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 26 Nov 2011 18:30:21 -0500 Subject: updated current docs to use in progress badge --- docs/conf.py | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index c78285840..f97ad1547 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -147,6 +147,7 @@ html_theme = 'pyramid' html_theme_options = { 'github_url': 'https://github.com/Pylons/pyramid' + 'in_progress': True } # The style sheet to use for HTML and HTML Help pages. A file of that name -- cgit v1.2.3 From a3a2186ab501f68de43c76d7d30194169360dc0e Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 26 Nov 2011 19:17:51 -0500 Subject: =?UTF-8?q?gardening=E2=80=A6=20dumb=20me=20:(?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 4010cf111..895f80344 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -146,7 +146,7 @@ html_theme_path = ['_themes'] html_theme = 'pyramid' html_theme_options = { - 'github_url': 'https://github.com/Pylons/pyramid' + 'github_url': 'https://github.com/Pylons/pyramid', 'in_progress': True } -- cgit v1.2.3 From ecf7a2b8ec62c542aed17558d2525f495a72ae3b Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 26 Nov 2011 20:02:56 -0500 Subject: attempted to fix theme update for rtd --- docs/conf.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 895f80344..e37e758ce 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -38,6 +38,7 @@ LaTeXTranslator.visit_inline = nothing LaTeXTranslator.depart_inline = nothing book = os.environ.get('BOOK') +rtd = os.environ.get('READTHEDOCS', None) == 'True' # If your extensions are in another directory, add it here. If the directory # is relative to the documentation root, use os.path.abspath to make it @@ -47,6 +48,8 @@ sys.path.append(os.path.abspath(parent)) wd = os.getcwd() os.chdir(parent) os.system('%s setup.py test -q' % sys.executable) +if rtd: + os.system('git submodule update --init') os.chdir(wd) for item in os.listdir(parent): -- cgit v1.2.3 From ecf932c51b8f279199c68fc4925a2cdd0b0671a7 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 26 Nov 2011 21:12:53 -0500 Subject: fix for themes on rtd --- docs/conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index e37e758ce..39b6e7a04 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -49,7 +49,10 @@ wd = os.getcwd() os.chdir(parent) os.system('%s setup.py test -q' % sys.executable) if rtd: - os.system('git submodule update --init') + from subprocess import Popen, PIPE + p = subprocess.Popen('which git', shell=True, stdout=subprocess.PIPE) + git = p.stdout.read().strip() + os.system('rm -Rf docs/_themes; {0} submodule update --init'.format(git)) os.chdir(wd) for item in os.listdir(parent): -- cgit v1.2.3 From 9016fe3416407481176df2360335affc15d6255c Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 26 Nov 2011 21:14:53 -0500 Subject: garden --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 39b6e7a04..97294d245 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ os.chdir(parent) os.system('%s setup.py test -q' % sys.executable) if rtd: from subprocess import Popen, PIPE - p = subprocess.Popen('which git', shell=True, stdout=subprocess.PIPE) + p = subprocess.Popen('which git', shell=True, stdout=PIPE) git = p.stdout.read().strip() os.system('rm -Rf docs/_themes; {0} submodule update --init'.format(git)) os.chdir(wd) -- cgit v1.2.3 From 6a10cd1156095bec367d89d8c13b6a11a5f8c254 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 26 Nov 2011 21:16:41 -0500 Subject: =?UTF-8?q?garden=E2=80=A6=20time=20for=20me=20to=20get=20some=20r?= =?UTF-8?q?est=20I=20think=20:(?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 97294d245..f751c32e6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,7 +50,7 @@ os.chdir(parent) os.system('%s setup.py test -q' % sys.executable) if rtd: from subprocess import Popen, PIPE - p = subprocess.Popen('which git', shell=True, stdout=PIPE) + p = Popen('which git', shell=True, stdout=PIPE) git = p.stdout.read().strip() os.system('rm -Rf docs/_themes; {0} submodule update --init'.format(git)) os.chdir(wd) -- cgit v1.2.3 From afe7a786bd2a75b7c9d36f58856b72b6978ef617 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 26 Nov 2011 22:27:43 -0500 Subject: work around for submodule not updating to latest commit --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index f751c32e6..874425808 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ if rtd: from subprocess import Popen, PIPE p = Popen('which git', shell=True, stdout=PIPE) git = p.stdout.read().strip() - os.system('rm -Rf docs/_themes; {0} submodule update --init'.format(git)) + os.system('{0} submodule update --init; {0} foreach git pull origin master'.format(git)) os.chdir(wd) for item in os.listdir(parent): -- cgit v1.2.3 From 9396b476bab8a2fb885c65791b2150d74ceac122 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sat, 26 Nov 2011 22:35:48 -0500 Subject: git submodule missing --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 874425808..4a39f5d64 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,7 +52,7 @@ if rtd: from subprocess import Popen, PIPE p = Popen('which git', shell=True, stdout=PIPE) git = p.stdout.read().strip() - os.system('{0} submodule update --init; {0} foreach git pull origin master'.format(git)) + os.system('{0} submodule update --init; {0} submodule foreach git pull origin master;'.format(git)) os.chdir(wd) for item in os.listdir(parent): -- cgit v1.2.3 From d0a25788fca2d2ebbf008658401e0d64ae232a8d Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sun, 27 Nov 2011 12:33:27 -0500 Subject: updated doc theme workflow --- docs/conf.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 4a39f5d64..6443ed17e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -38,7 +38,6 @@ LaTeXTranslator.visit_inline = nothing LaTeXTranslator.depart_inline = nothing book = os.environ.get('BOOK') -rtd = os.environ.get('READTHEDOCS', None) == 'True' # If your extensions are in another directory, add it here. If the directory # is relative to the documentation root, use os.path.abspath to make it @@ -48,11 +47,6 @@ sys.path.append(os.path.abspath(parent)) wd = os.getcwd() os.chdir(parent) os.system('%s setup.py test -q' % sys.executable) -if rtd: - from subprocess import Popen, PIPE - p = Popen('which git', shell=True, stdout=PIPE) - git = p.stdout.read().strip() - os.system('{0} submodule update --init; {0} submodule foreach git pull origin master;'.format(git)) os.chdir(wd) for item in os.listdir(parent): @@ -147,15 +141,29 @@ if book: # ----------------------- # Add and use Pylons theme +from subprocess import call, Popen, PIPE + +p = Popen('which git', shell=True, stdout=PIPE) +git = p.stdout.read().strip() +cwd = os.getcwd() +_themes = os.path.join(cwd, '_themes') + +if not os.path.isdir(_themes): + call(['git', 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git', + '_themes']) +else: + os.chdir(_themes) + call(['git', 'checkout', 'master']) + call(['git', 'pull']) + os.chdir(cwd) + sys.path.append(os.path.abspath('_themes')) html_theme_path = ['_themes'] html_theme = 'pyramid' - -html_theme_options = { - 'github_url': 'https://github.com/Pylons/pyramid', - 'in_progress': True -} - +html_theme_options = dict( + github_url='https://github.com/Pylons/pyramid_tutorials', + in_progress='true' + ) # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths # given in html_static_path. -- cgit v1.2.3 From 862a265e9274239ca835745dea8c5bc4b42910f2 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sun, 27 Nov 2011 12:41:50 -0500 Subject: fixed github url --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 6443ed17e..b40d3f08d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -161,7 +161,7 @@ sys.path.append(os.path.abspath('_themes')) html_theme_path = ['_themes'] html_theme = 'pyramid' html_theme_options = dict( - github_url='https://github.com/Pylons/pyramid_tutorials', + github_url='https://github.com/Pylons/pyramid', in_progress='true' ) # The style sheet to use for HTML and HTML Help pages. A file of that name -- cgit v1.2.3 From 480df1f5227d5beda988431ea7588241338ff54f Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sun, 27 Nov 2011 12:55:28 -0500 Subject: fixed version number --- docs/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index b40d3f08d..092c1fca3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -476,7 +476,7 @@ def resig(app, what, name, obj, options, signature, return_annotation): # -- Options for Epub output --------------------------------------------------- # Bibliographic Dublin Core info. -epub_title = 'The Pyramid Web Application Development Framework, Version 1.2' +epub_title = 'The Pyramid Web Application Development Framework, Version 1.3dev' epub_author = 'Chris McDonough' epub_publisher = 'Agendaless Consulting' epub_copyright = '2008-2011' @@ -493,7 +493,7 @@ epub_scheme = 'ISBN' epub_identifier = '0615445675' # A unique identification for the text. -epub_uid = 'The Pyramid Web Application Development Framework, Version 1.2' +epub_uid = 'The Pyramid Web Application Development Framework, Version 1.3dev' # HTML files that should be inserted before the pages created by sphinx. # The format is a list of tuples containing the path and title. -- cgit v1.2.3 From fd685bae73933434b4c4fd0689898407fd4f9058 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Sun, 27 Nov 2011 13:14:40 -0500 Subject: fixed git ref --- docs/conf.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 092c1fca3..530703e14 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -149,12 +149,12 @@ cwd = os.getcwd() _themes = os.path.join(cwd, '_themes') if not os.path.isdir(_themes): - call(['git', 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git', + call([git, 'clone', 'git://github.com/Pylons/pylons_sphinx_theme.git', '_themes']) else: os.chdir(_themes) - call(['git', 'checkout', 'master']) - call(['git', 'pull']) + call([git, 'checkout', 'master']) + call([git, 'pull']) os.chdir(cwd) sys.path.append(os.path.abspath('_themes')) -- cgit v1.2.3