Merge branch 'master' of https://github.com/okfn/ckan

CHANGELOG.txt

@@ -1,6 +1,12 @@
 CKAN CHANGELOG
 ++++++++++++++
 
+v1.8
+====
+
+* requirements have been updated see doc/install-from-source.rst
+users will need to do a new pip install (#2592)
+
 v1.7.1 2012-06-20
 =================
 

ckan/tests/test_plugins.py

@@ -168,15 +168,15 @@ def test_mapper_plugin_fired(self):
         config['ckan.plugins'] = 'mapper_plugin'
         plugins.load_all(config)
         CreateTestData.create_arbitrary([{'name':u'testpkg'}])
-        mapper_plugin = PluginGlobals.plugin_registry['MapperPlugin'].__instance__
+        mapper_plugin = PluginGlobals.env_registry['pca'].plugin_registry['MapperPlugin'].__instance__
         assert len(mapper_plugin.added) == 2 # resource group table added automatically
         assert mapper_plugin.added[0].name == 'testpkg'
 
     def test_routes_plugin_fired(self):
         local_config = appconfig('config:%s' % config['__file__'], relative_to=conf_dir)
         local_config.local_conf['ckan.plugins'] = 'routes_plugin'
         app = make_app(local_config.global_conf, **local_config.local_conf)
-        routes_plugin = PluginGlobals.plugin_registry['RoutesPlugin'].__instance__
+        routes_plugin = PluginGlobals.env_registry['pca'].plugin_registry['RoutesPlugin'].__instance__
         assert routes_plugin.calls_made == ['before_map', 'after_map'], \
                routes_plugin.calls_made
 

doc/solr-setup.rst

@@ -57,9 +57,18 @@ and the admin site::
 
  http://localhost:8983/solr/admin
 
-.. note:: If you get the message ``Could not start Jetty servlet engine because no Java Development Kit (JDK) was found.`` then you will have to edit the ``JAVA_HOME`` setting in ``/etc/default/jetty`` (adjusting the path for your machine's JDK install):
+.. note::
+
+    If you get the message ``Could not start Jetty servlet engine because no
+    Java Development Kit (JDK) was found.`` then you will have to edit the
+    ``JAVA_HOME`` setting in ``/etc/default/jetty`` to point to your machine's
+    JDK install location. For example::
+
+        JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64/
+
+    or::
 
-    ``JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64/``
+        JAVA_HOME=/usr/lib/jvm/java-6-openjdk-i386/
 
 Now run::
 
@@ -77,7 +86,7 @@ so, create a symbolic link to the schema file in the config folder. Use the late
 supported by the CKAN version you are installing (it will generally be the highest one)::
 
  sudo mv /etc/solr/conf/schema.xml /etc/solr/conf/schema.xml.bak
- sudo ln -s ~/ckan/ckan/config/solr/schema-1.4.xml /etc/solr/conf/schema.xml
+ sudo ln -s ~/pyenv/src/ckan/ckan/config/solr/schema-1.4.xml /etc/solr/conf/schema.xml
 
 Now restart jetty::
 

doc/test.rst

@@ -12,31 +12,22 @@ Installing Additional Dependencies
 ----------------------------------
 
 Some additional dependencies are needed to run the tests. Make sure you've
-created a config file at ``pyenv/ckan/development.ini``, then activate your
+created a config file at ``~/pyenv/ckan/development.ini``, then activate your
 virtual environment::
 
-    . pyenv/bin/activate
+    . ~/pyenv/bin/activate
 
 Install nose and other test-specific CKAN dependencies into your virtual
 environment::
 
-    pip install --ignore-installed -r pyenv/src/ckan/pip-requirements-test.txt
-
-At this point you'll need to deactivate and then re-activate your
-virtual environment to ensure that all the scripts point to the correct
-locations:
-
-::
-
-    deactivate
-    . pyenv/bin/activate
+    pip install -r ~/pyenv/src/ckan/pip-requirements-test.txt
 
 Testing with SQLite
 -------------------
 
 To run the CKAN tests using SQLite as the database library::
 
-    cd pyenv/src/ckan
+    cd ~/pyenv/src/ckan
     nosetests --ckan ckan
 
 You *must* run the tests from the CKAN directory as shown above, otherwise the
@@ -123,7 +114,4 @@ is how the database is created and upgraded in production.
 Common error messages
 ---------------------
 
-Often errors are due to set-up errors. Always refer to the CKAN buildbot as the
-canonical build.
-
 Consult :doc:`common-error-messages` for solutions to a range of setup problems.

pip-requirements-test.txt

@@ -1,5 +1,6 @@
 # These are packages that required when running ckan tests
 
 nose
+requests==0.6.4
 -e git+https://github.com/okfn/ckanclient#egg=ckanclient
 

pip-requirements.txt

@@ -1,15 +1,27 @@
-# This file allows you to install CKAN and all its dependencies
-# in a virtual environment.
-#
-# Use it like this:
-# 
-#     pip install --ignore-installed -r pip-requirements.txt
-
--e git+https://github.com/okfn/ckan@master#egg=ckan
-# CKAN dependencies
--r https://github.com/okfn/ckan/raw/master/requires/lucid_conflict.txt
--r https://github.com/okfn/ckan/raw/master/requires/lucid_present.txt
--r https://github.com/okfn/ckan/raw/master/requires/lucid_missing.txt
-
-# NOTE: Developers, please do not edit this file. Changes should go in the
-#       appropriate files in the `requires' directory.
+# This file lists CKAN's dependencies so that you can install them (e.g. into
+# a Python virtual environment) after you have installed CKAN, with a command
+# like: pip install -r pip-requirements.txt. See the Install from Source
+# instructions in CKAN's documentation for full installation instructions.
+Genshi==0.6
+sqlalchemy-migrate==0.7.1
+sqlalchemy==0.7.3
+webhelpers==1.2
+PyUtilib==4.0.2848
+-e git+https://github.com/okfn/vdm.git@vdm-0.11#egg=vdm
+solrpy==0.9.4
+formalchemy==1.4.1
+pairtree==0.7.1-T
+ofs==0.4.1
+apachemiddleware==0.1.1
+markupsafe==0.9.2
+babel==0.9.4
+psycopg2==2.0.13
+webob==1.0.8
+Pylons==0.9.7
+repoze.who==1.0.19
+tempita==0.4
+zope.interface==3.5.3
+repoze.who.plugins.openid==0.5.3
+repoze.who-friendlyform==1.0.8
+routes==1.12
+paste==1.7.2