diff --git a/README.rst b/README.rst index 8cc867f4844..2235d807868 100644 --- a/README.rst +++ b/README.rst @@ -12,12 +12,12 @@ http://ckan.org/. Building Documentation ====================== -1. Install python-sphinx +1. Install python-sphinx (>= 1.1) 2. Initialize the theme submodule:: - git submodule init - git submodule update + git submodule init + git submodule update 3. Run the command to build the docs:: diff --git a/doc/install-from-source.rst b/doc/install-from-source.rst index 767a9e597cd..5e9f621ca24 100644 --- a/doc/install-from-source.rst +++ b/doc/install-from-source.rst @@ -126,7 +126,7 @@ WebOb has to be installed explicitly afterwards because by installing pylons wit Now to install the remaining dependencies in requires/lucid_present.txt and you are using Ubuntu Lucid 10.04 you can install the system versions:: sudo apt-get install python-pybabel python-psycopg2 python-lxml - sudo apt-get install python-sphinx python-pylons python-repoze.who + sudo apt-get install python-pylons python-repoze.who sudo apt-get install python-repoze.who-plugins python-tempita python-zope.interface Alternatively, if you are not using Ubuntu Lucid 10.04 you'll need to install them like this: diff --git a/pip-requirements-prerelease.txt b/pip-requirements-prerelease.txt deleted file mode 100644 index aa7af689547..00000000000 --- a/pip-requirements-prerelease.txt +++ /dev/null @@ -1,11 +0,0 @@ -# To use this requirements file: (assumes virtualenv at ./pyenv) -# pip -E pyenv install -r pip-requirements.txt - -sphinx<0.9 -psycopg2 --e hg+https://solrpy.googlecode.com/hg#egg=solrpy --e hg+https://bitbucket.org/okfn/vdm#egg=vdm --e hg+https://bitbucket.org/okfn/licenses#egg=licenses --e hg+https://bitbucket.org/okfn/ckanclient@ckanclient-v0.6#egg=ckanclient --e hg+https://bitbucket.org/okfn/ckan@ckan-1.3#egg=ckan - diff --git a/requires/lucid_present.txt b/requires/lucid_present.txt index f2d0bc18312..aabdb0cedad 100644 --- a/requires/lucid_present.txt +++ b/requires/lucid_present.txt @@ -3,13 +3,12 @@ # you can install these dependencies via pip instead. # # sudo apt-get install python-pybabel python-psycopg2 python-lxml -# sudo apt-get install python-sphinx python-pylons python-repoze.who +# sudo apt-get install python-pylons python-repoze.who # sudo apt-get install python-repoze.who-plugins python-tempita python-zope.interface babel==0.9.4 psycopg2==2.0.13 lxml==2.2.4 -sphinx==0.6.4 # Specifying particular version of WebOb because later version has incompatibility # with pylons 0.9.7 (change to imports of Multidict) webob==1.0.8