[release-v1.6]: Add start of changelog. Minor code changes to avoid w…

…arnings. Correction to extension docs.

CHANGELOG.txt

@@ -1,7 +1,17 @@
 CKAN CHANGELOG
 ++++++++++++++
 
-v1.5.1 2011-01-04
+v1.6 2012-02-XX
+===============
+Major:
+ * Tags not restricted to just letters and dashes (#1453)
+
+Minor:
+
+Bug fixes:
+ * Unicode characters in field-specific API search queries caused exception (since CKAN 1.5) (#1798)
+
+v1.5.1 2012-01-04
 =================
 
 Major:

ckan/lib/base.py

@@ -114,7 +114,7 @@ def _identify_user(self):
                 # and then restart i.e. only really for testers. There is no
                 # user object, so even though repoze thinks you are logged in
                 # and your cookie has ckan_display_name, we need to force user
-                # to login again to get the User object.
+                # to logout and login again to get the User object.
                 c.user = None
         else:
             c.userobj = self._get_user_for_apikey()

ckan/lib/hash.py

@@ -3,12 +3,11 @@
 
 from pylons import config, request
 
-global secret
 secret = None
 
 def get_message_hash(value):
+    global secret
     if not secret:
-        global secret
         # avoid getting config value at module scope since config may
         # not be read in yet
         secret = config['beaker.session.secret']

ckan/tests/functional/api/base.py

@@ -417,6 +417,7 @@ def http_request(self, offset, data,
         if content_length is not None:
             environ['CONTENT_LENGTH'] = str(content_length)
         environ['REQUEST_METHOD'] = request_method
+        environ['QUERY_STRING'] = '' # avoids a warning
         environ['wsgi.input'] = StringIO(data)
         if extra_environ:
             environ.update(extra_environ)

ckan/tests/functional/api/test_activity.py

@@ -641,8 +641,8 @@ def _delete_resources(self, package):
         if not activity.has_key('revision_id'):
             assert False, "activity has no revision_id value"
         timestamp = datetime_from_string(activity['timestamp'])
-        assert (timestamp >= before['time'] and
-            timestamp <= after['time'], str(activity['timestamp']))
+        assert timestamp >= before['time'], str(activity['timestamp'])
+        assert timestamp <= after['time'], str(activity['timestamp'])
 
         # Test for the presence of correct activity detail items.
         details = self.activity_details(activity)

doc/extensions.rst

@@ -45,9 +45,9 @@ If it is not here, to get the definitive answer, check your CKAN Apache configur
 
 #. Install the extension package code into your pyenv using ``pip``.
 
- For example, to install the Disqus extension, which allows users to comment on datasets::
+ For example, to install the Disqus extension, which allows users to comment on datasets (replacing "INSTANCE_NAME" with the name of your CKAN instance)::
 
-       /var/lib/ckan/INSTANCE_NAME/pyenv/bin/pip install -E /var/lib/ckan/INSTANCE_NAME/pyenv -e git+https://github.com/okfn/ckanext-disqus.git#egg=ckanext-disqus
+       sudo -u ckanINSTANCE_NAME /var/lib/ckan/INSTANCE_NAME/pyenv/bin/pip install -E /var/lib/ckan/INSTANCE_NAME/pyenv -e git+https://github.com/okfn/ckanext-disqus.git#egg=ckanext-disqus --log=/tmp/pip-log.txt
 
  Prefix the source URL with the repo type (``hg+`` for Mercurial, ``git+`` for Git).