[ckan-changes] commit/ckan: 3 new changesets

[Bitbucket]

3 new changesets in ckan:

http://bitbucket.org/okfn/ckan/changeset/a195ac08b417/
changeset:   a195ac08b417
branch:      release-v1.4.1
user:        dread
date:        2011-06-08 14:44:20
summary:     [release] branch for 1.4.1.
affected #:  3 files (518 bytes)

--- a/CHANGELOG.txt	Wed Jun 08 12:27:26 2011 +0100
+++ b/CHANGELOG.txt	Wed Jun 08 13:44:20 2011 +0100
@@ -1,6 +1,18 @@
 CKAN CHANGELOG
 ++++++++++++++
 
+v1.4.1 2011-XX-XX
+=================
+Minor:
+  * Links in user-supplied text made less attractive to spammers (nofollow) #1181 
+  * Package change notifications - remove duplicates (#1149)
+  * Metadata dump linked to (#1169)
+  * Refactor authorization code to be common across Package, Group and Authorization Group (#1074)
+  * Refactor Web interface to use logic layer rather than model objects directly (#1078)
+
+Bug fixes
+  * Duplicate authorization roles were difficult to delete (#1083)
+
 v1.4 2011-05-19
 ===============
 Major:


--- a/ckan/__init__.py	Wed Jun 08 12:27:26 2011 +0100
+++ b/ckan/__init__.py	Wed Jun 08 13:44:20 2011 +0100
@@ -1,4 +1,4 @@
-__version__ = '1.4.1a'
+__version__ = '1.4.1b'
 __description__ = 'Comprehensive Knowledge Archive Network (CKAN) Software'
 __long_description__ = \
 '''The CKAN software is used to run the Comprehensive Knowledge Archive


--- a/pip-requirements.txt	Wed Jun 08 12:27:26 2011 +0100
+++ b/pip-requirements.txt	Wed Jun 08 13:44:20 2011 +0100
@@ -5,11 +5,11 @@
 # 
 #     pip install --ignore-installed -r pip-requirements.txt
 
--e hg+https://bitbucket.org/okfn/ckan@default#egg=ckan
+-e hg+https://bitbucket.org/okfn/ckan@release-v1.4.1#egg=ckan
 # CKAN dependencies
--r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_conflict.txt
--r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_present.txt
--r https://bitbucket.org/okfn/ckan/raw/default/requires/lucid_missing.txt
+-r https://bitbucket.org/okfn/ckan/raw/release-v1.4.1/requires/lucid_conflict.txt
+-r https://bitbucket.org/okfn/ckan/raw/release-v1.4.1/requires/lucid_present.txt
+-r https://bitbucket.org/okfn/ckan/raw/release-v1.4.1/requires/lucid_missing.txt
 
 # NOTE: Developers, please do not edit this file. Changes should go in the
 #       appropriate files in the `requires' directory.


http://bitbucket.org/okfn/ckan/changeset/90ace9c652a4/
changeset:   90ace9c652a4
branch:      release-v1.4.1
user:        dread
date:        2011-06-08 14:44:42
summary:     [tests]: #1181 Fix broken test.
affected #:  1 file (116 bytes)

--- a/ckan/tests/functional/test_package.py	Wed Jun 08 13:44:20 2011 +0100
+++ b/ckan/tests/functional/test_package.py	Wed Jun 08 13:44:42 2011 +0100
@@ -346,11 +346,8 @@
         offset = url_for(controller='package', action='read', id=pkg_name)
         res = self.app.get(offset)
         def check_link(res, controller, id):
-            link = '<a href="/%s/%s">%s:%s</a>' % (controller, id, controller, id)
-            if link not in res:
-                print self.main_div(res).encode('utf8')
-                print 'Missing link: %r' % link
-                raise AssertionError
+            self.check_tag_and_data(res, 'a ', '/%s/%s' % (controller, id),
+                                    '%s:%s' % (controller, id))
         check_link(res, 'package', 'pkg-1')
         check_link(res, 'tag', 'tag_1')
         check_link(res, 'group', 'test-group-1')


http://bitbucket.org/okfn/ckan/changeset/fd8d44ea4d9b/
changeset:   fd8d44ea4d9b
user:        dread
date:        2011-06-08 14:46:15
summary:     [merge] from branch release-v1.4.1.
affected #:  4 files (606 bytes)

--- a/CHANGELOG.txt	Wed Jun 08 12:27:26 2011 +0100
+++ b/CHANGELOG.txt	Wed Jun 08 13:46:15 2011 +0100
@@ -1,6 +1,18 @@
 CKAN CHANGELOG
 ++++++++++++++
 
+v1.4.1 2011-XX-XX
+=================
+Minor:
+  * Links in user-supplied text made less attractive to spammers (nofollow) #1181 
+  * Package change notifications - remove duplicates (#1149)
+  * Metadata dump linked to (#1169)
+  * Refactor authorization code to be common across Package, Group and Authorization Group (#1074)
+  * Refactor Web interface to use logic layer rather than model objects directly (#1078)
+
+Bug fixes
+  * Duplicate authorization roles were difficult to delete (#1083)
+
 v1.4 2011-05-19
 ===============
 Major:


--- a/ckan/__init__.py	Wed Jun 08 12:27:26 2011 +0100
+++ b/ckan/__init__.py	Wed Jun 08 13:46:15 2011 +0100
@@ -1,4 +1,4 @@
-__version__ = '1.4.1a'
+__version__ = '1.4.2a'
 __description__ = 'Comprehensive Knowledge Archive Network (CKAN) Software'
 __long_description__ = \
 '''The CKAN software is used to run the Comprehensive Knowledge Archive


--- a/ckan/tests/functional/test_package.py	Wed Jun 08 12:27:26 2011 +0100
+++ b/ckan/tests/functional/test_package.py	Wed Jun 08 13:46:15 2011 +0100
@@ -346,11 +346,8 @@
         offset = url_for(controller='package', action='read', id=pkg_name)
         res = self.app.get(offset)
         def check_link(res, controller, id):
-            link = '<a href="/%s/%s">%s:%s</a>' % (controller, id, controller, id)
-            if link not in res:
-                print self.main_div(res).encode('utf8')
-                print 'Missing link: %r' % link
-                raise AssertionError
+            self.check_tag_and_data(res, 'a ', '/%s/%s' % (controller, id),
+                                    '%s:%s' % (controller, id))
         check_link(res, 'package', 'pkg-1')
         check_link(res, 'tag', 'tag_1')
         check_link(res, 'group', 'test-group-1')

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.