Merge remote-tracking branch 'upstream/master' into pypi-compliance

This commit is contained in:
Tony Narlock 2013-11-04 08:49:29 +08:00
commit 166ba8e7b3
3 changed files with 9 additions and 8 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
*.pyc *.pyc
*.egg-info *.egg-info
*.egg
*build/ *build/
.tox .tox
.coverage .coverage

View File

@ -29,13 +29,13 @@ Via package
Download the package or add it to your ``requirements.txt`` file: Download the package or add it to your ``requirements.txt`` file:
.. code-block:: bash .. code:: bash
$ pip install sphinx_rtd_theme $ pip install sphinx_rtd_theme
In your ``conf.py`` file: In your ``conf.py`` file:
.. code-block:: python .. code:: python
import sphinx_rtd_theme import sphinx_rtd_theme
@ -50,7 +50,7 @@ Symlink or subtree the ``sphinx_rtd_theme/sphinx_rtd_theme`` repository into you
``docs/_themes/sphinx_rtd_theme`` then add the following two settings to your Sphinx ``docs/_themes/sphinx_rtd_theme`` then add the following two settings to your Sphinx
conf.py file: conf.py file:
.. code-block:: python .. code:: python
html_theme = "sphinx_rtd_theme" html_theme = "sphinx_rtd_theme"
html_theme_path = ["_themes", ] html_theme_path = ["_themes", ]
@ -81,19 +81,19 @@ Set up your environment
1. Install sphinx_ into a virtual environment. 1. Install sphinx_ into a virtual environment.
.. code-block:: .. code::
pip install sphinx pip install sphinx
2. Install sass and compass 2. Install sass and compass
.. code-block:: .. code::
gem install sass compass gem install sass compass
2. Install node, bower and grunt. 2. Install node, bower and grunt.
.. code-block:: .. code::
// Install node // Install node
brew install node brew install node
@ -107,7 +107,7 @@ Set up your environment
Now that our environment is set up, make sure you're in your virtual environment, go to Now that our environment is set up, make sure you're in your virtual environment, go to
this repository in your terminal and run grunt: this repository in your terminal and run grunt:
.. code-block:: .. code::
grunt grunt

View File

@ -5,7 +5,7 @@ From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
""" """
import os import os
VERSION = (0, 1, 0) VERSION = (0, 1, 1)
__version__ = ".".join(str(v) for v in VERSION) __version__ = ".".join(str(v) for v in VERSION)
__version_full__ = __version__ __version_full__ = __version__