1. Josh VanderLinden
  2. hgblog

Commits

Josh VanderLinden  committed 6ba15da

Updating to Sphinx tip

  • Participants
  • Parent commits 8ffd845
  • Branches default
  • Tags 0.5

Comments (0)

Files changed (2)

File quickstart.patch

View file
 # HG changeset patch
-# Parent e6a739003667615559936c787600975362279220
+# Parent 5350c56aeddb2cfe306b5c5691b86a1d1a2889e9
 
-diff -r e6a739003667 setup.py
---- a/setup.py	Mon Apr 26 15:37:37 2010 -0400
-+++ b/setup.py	Mon Apr 26 15:42:10 2010 -0400
-@@ -42,7 +42,7 @@
+diff -r 5350c56aeddb setup.py
+--- a/setup.py	Mon Jun 07 17:12:14 2010 -0400
++++ b/setup.py	Mon Jun 07 17:12:54 2010 -0400
+@@ -45,7 +45,7 @@ A development egg can be found `here
  <http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_.
  '''
  
--requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.4']
-+requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.4', 'mercurial>=1.5']
+-requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.5']
++requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.5', 'mercurial>=1.5']
  
  if sys.version_info < (2, 4):
      print 'ERROR: Sphinx requires at least Python 2.4 to run.'
-diff -r e6a739003667 sphinx/quickstart.py
---- a/sphinx/quickstart.py	Mon Apr 26 15:37:37 2010 -0400
-+++ b/sphinx/quickstart.py	Mon Apr 26 15:42:10 2010 -0400
-@@ -19,6 +19,7 @@
+diff -r 5350c56aeddb sphinx/quickstart.py
+--- a/sphinx/quickstart.py	Mon Jun 07 17:12:14 2010 -0400
++++ b/sphinx/quickstart.py	Mon Jun 07 17:12:54 2010 -0400
+@@ -19,6 +19,7 @@ from sphinx.util.osutil import make_file
  from sphinx.util.console import purple, bold, red, turquoise, \
       nocolor, color_terminal
  from sphinx.util import texescape
  
  
  PROMPT_PREFIX = '> '
-@@ -66,17 +67,19 @@
+@@ -27,7 +28,7 @@ QUICKSTART_CONF = '''\
+ # -*- coding: utf-8 -*-
+ #
+ # %(project)s documentation build configuration file, created by
+-# sphinx-quickstart on %(now)s.
++# hgblog-quickstart on %(now)s.
+ #
+ # This file is execfile()d with the current directory set to its containing dir.
+ #
+@@ -66,17 +67,19 @@ source_suffix = '%(suffix)s'
  master_doc = '%(master_str)s'
  
  # General information about the project.
  
  # The language for content autogenerated by Sphinx. Refer to documentation
  # for a list of supported languages.
-@@ -90,7 +93,12 @@
+@@ -90,7 +93,12 @@ release = '%(release_str)s'
  
  # List of patterns, relative to source directory, that match files and
  # directories to ignore when looking for source files.
  
  # The reST default role (used for this markup: `text`) to use for all documents.
  #default_role = None
-@@ -117,7 +125,7 @@
+@@ -117,7 +125,7 @@ pygments_style = 'sphinx'
  
- # The theme to use for HTML and HTML Help pages.  Major themes that come with
- # Sphinx are currently 'default' and 'sphinxdoc'.
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
 -html_theme = 'default'
 +html_theme = 'conjunction'
  
  # Theme options are theme-specific and customize the look and feel of a theme
  # further.  For a list of options available for each theme, see the
-@@ -129,7 +137,7 @@
+@@ -129,7 +137,7 @@ html_theme = 'default'
  
  # The name for this set of Sphinx documents.  If None, it defaults to
  # "<project> v<release> documentation".
  
  # A shorter title for the navigation bar.  Default is the same as html_title.
  #html_short_title = None
-@@ -232,7 +240,7 @@
+@@ -238,7 +246,7 @@ latex_documents = [
  # (source start file, name, description, authors, manual section).
  man_pages = [
      ('%(master_str)s', '%(project_manpage)s', u'%(project_doc)s',
  ]
  '''
  
-@@ -241,10 +249,10 @@
+@@ -247,10 +255,10 @@ EPUB_CONFIG = '''
  # -- Options for Epub output ---------------------------------------------------
  
  # Bibliographic Dublin Core info.
  
  # The language of the text. It defaults to the language option
  # or en if the language is not set.
-@@ -282,28 +290,36 @@
+@@ -288,35 +296,43 @@ intersphinx_mapping = {'http://docs.pyth
  '''
  
  MASTER_FILE = '''\
  MAKEFILE = '''\
  # Makefile for Sphinx documentation
  #
-@@ -671,27 +687,35 @@
+ 
+ # You can set these variables from the command line.
+ SPHINXOPTS    =
+-SPHINXBUILD   = sphinx-build
++SPHINXBUILD   = hgblog-build
+ PAPER         =
+ BUILDDIR      = %(rbuilddir)s
+ 
+@@ -453,7 +469,7 @@ BATCHFILE = '''\
+ REM Command file for Sphinx documentation
+ 
+ if "%%SPHINXBUILD%%" == "" (
+-\tset SPHINXBUILD=sphinx-build
++\tset SPHINXBUILD=hgblog-build
+ )
+ set BUILDDIR=%(rbuilddir)s
+ set ALLSPHINXOPTS=-d %%BUILDDIR%%/doctrees %%SPHINXOPTS%% %(rsrcdir)s
+@@ -677,27 +693,35 @@ def do_prompt(d, key, text, default=None
  
  
  def inner_main(args):
          print
          do_prompt(d, 'path', 'Please enter a new root path (or just Enter '
                    'to exit)', '', is_path)
-@@ -699,56 +723,14 @@
+@@ -705,56 +729,14 @@ Enter the root path for documentation.''
              sys.exit(1)
  
      print '''
  
      print '''
  Please indicate if you want to use one of the following Sphinx extensions:'''
-@@ -775,7 +757,7 @@
+@@ -781,7 +763,7 @@ pngmath has been deselected.'''
                'of documented Python objects (y/N)', 'n', boolean)
      print '''
  A Makefile and a Windows command file can be generated for you so that you
  directly.'''
      do_prompt(d, 'makefile', 'Create Makefile? (Y/n)', 'y', boolean)
      do_prompt(d, 'batchfile', 'Create Windows command file? (Y/n)',
-@@ -793,19 +775,42 @@
+@@ -799,19 +781,42 @@ directly.'''
      d['copyright'] = time.strftime('%Y') + ', ' + d['author']
      d['author_texescaped'] = unicode(d['author']).\
                               translate(texescape.tex_escape_map)
      srcdir = d['sep'] and path.join(d['path'], 'source') or d['path']
  
      mkdir_p(srcdir)
-@@ -834,6 +839,11 @@
+@@ -840,6 +845,11 @@ directly.'''
      f.write((MASTER_FILE % d).encode('utf-8'))
      f.close()
  
      if d['makefile']:
          d['rsrcdir'] = d['sep'] and 'source' or '.'
          d['rbuilddir'] = d['sep'] and 'build' or d['dot'] + 'build'
-@@ -849,20 +859,13 @@
+@@ -855,20 +865,13 @@ directly.'''
          f.write((BATCHFILE % d).encode('utf-8'))
          f.close()
  

File rename_files.patch

View file
 # HG changeset patch
-# Parent 14ea69c060081944edea66ca8e111172d806fa63
+# Parent 04464ddd8808c655110c8203a7cbd712df54ddbc
 
 diff --git a/.hgignore b/.hgignore
 --- a/.hgignore
 diff --git a/README b/README
 --- a/README
 +++ b/README
-@@ -9,8 +9,8 @@
- 
- Use ``setup.py``::
- 
--   python setup.py build
--   sudo python setup.py install
-+    python setup.py build
-+    sudo python setup.py install
- 
- 
- Reading the docs
-@@ -18,15 +18,16 @@
- 
- After installing::
- 
--   cd doc
--   sphinx-build . _build/html
-+    cd doc
-+    sphinx-build . _build/html
+@@ -23,7 +23,7 @@ After installing::
  
  Then, direct your browser to ``_build/html/index.html``.
  
  
  
  Contributing
- ============
- 
- Send wishes, comments, patches, etc. to sphinx-dev@googlegroups.com.
-+
 diff --git a/README.rst b/README.rst
 new file mode 120000
 --- /dev/null
 @@ -0,0 +1,4 @@
 +from server import serve
 +
-+__version__ = '0.4'
++__version__ = '0.5'
 +
 diff --git a/hgblog/refresh.py b/hgblog/refresh.py
 new file mode 100644
 diff --git a/setup.py b/setup.py
 --- a/setup.py
 +++ b/setup.py
-@@ -7,6 +7,7 @@
- from setuptools import setup, find_packages
+@@ -10,6 +10,7 @@ import os
+ import sys
  from distutils import log
  
 +import hgblog
  import sphinx
  
  long_desc = '''
-@@ -156,15 +157,15 @@
+@@ -159,15 +160,15 @@ else:
  
  
  setup(
 +    long_description=open('README').read(),
      zip_safe=False,
      classifiers=[
-         'Development Status :: 4 - Beta',
-@@ -182,12 +183,14 @@
+         'Development Status :: 5 - Production/Stable',
+@@ -187,12 +188,14 @@ setup(
      include_package_data=True,
      entry_points={
          'console_scripts': [