--- a/buildout.cfg Wed Jul 12 11:39:41 2017 +0200
+++ b/buildout.cfg Wed Jul 12 14:23:51 2017 +0200
@@ -18,17 +18,18 @@
#allow-picked-versions = false
src = src
-develop = .
- /var/local/src/pyams/ext/lingua
- ../pyams_catalog
- ../pyams_file
- ../pyams_form
- ../pyams_i18n
- ../pyams_pagelet
- ../pyams_skin
- ../pyams_template
- ../pyams_utils
- ../pyams_viewlet
+develop =
+ .
+ ../ext/lingua
+ ../pyams_catalog
+ ../pyams_file
+ ../pyams_form
+ ../pyams_i18n
+ ../pyams_pagelet
+ ../pyams_skin
+ ../pyams_template
+ ../pyams_utils
+ ../pyams_viewlet
parts =
package
@@ -44,6 +45,7 @@
pyams_catalog
pyams_utils
pyramid
+ requests
zope.component
zope.interface
@@ -70,4 +72,4 @@
eggs = pyams_catalog [test]
[versions]
-pyams_catalog = 0.1.3
+pyams_catalog = 0.1.4
--- a/docs/HISTORY.txt Wed Jul 12 11:39:41 2017 +0200
+++ b/docs/HISTORY.txt Wed Jul 12 14:23:51 2017 +0200
@@ -1,6 +1,15 @@
History
=======
+0.1.4
+-----
+ - updated CatalogResultSet class to be able to feed it with a list of internal IDs as well a Query object
+ - added "prepend" and "append" methods to CatalogResultSet class to be able to add a list of items to the beginning
+ or the end of the initial results list
+ - corrected "get_resolution" function with new doctests
+ - added custom IKeyValue adapter for catalog
+ - updated dependencies
+
0.1.3
-----
- added view to display properties of catalog indexes
--- a/setup.py Wed Jul 12 11:39:41 2017 +0200
+++ b/setup.py Wed Jul 12 14:23:51 2017 +0200
@@ -22,7 +22,7 @@
README = os.path.join(DOCS, 'README.txt')
HISTORY = os.path.join(DOCS, 'HISTORY.txt')
-version = '0.1.3'
+version = '0.1.4'
long_description = open(README).read() + '\n\n' + open(HISTORY).read()
tests_require = []
@@ -62,6 +62,7 @@
'pyams_i18n',
'pyams_utils',
'pyramid',
+ 'requests',
'ZODB',
'zope.interface',
'zope.intid',
--- a/src/pyams_catalog.egg-info/PKG-INFO Wed Jul 12 11:39:41 2017 +0200
+++ b/src/pyams_catalog.egg-info/PKG-INFO Wed Jul 12 14:23:51 2017 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: pyams-catalog
-Version: 0.1.3
+Version: 0.1.4
Summary: PyAMS catalog tools
Home-page: http://hg.ztfy.org/pyams/pyams_catalog
Author: Thierry Florac
@@ -11,6 +11,15 @@
History
=======
+ 0.1.4
+ -----
+ - updated CatalogResultSet class to be able to feed it with a list of internal IDs as well a Query object
+ - added "prepend" and "append" methods to CatalogResultSet class to be able to add a list of items to the beginning
+ or the end of the initial results list
+ - corrected "get_resolution" function with new doctests
+ - added custom IKeyValue adapter for catalog
+ - updated dependencies
+
0.1.3
-----
- added view to display properties of catalog indexes
--- a/src/pyams_catalog.egg-info/requires.txt Wed Jul 12 11:39:41 2017 +0200
+++ b/src/pyams_catalog.egg-info/requires.txt Wed Jul 12 14:23:51 2017 +0200
@@ -5,6 +5,7 @@
pyams_i18n
pyams_utils
pyramid
+requests
setuptools
zope.interface
zope.intid
--- a/src/pyams_catalog/utils.py Wed Jul 12 11:39:41 2017 +0200
+++ b/src/pyams_catalog/utils.py Wed Jul 12 14:23:51 2017 +0200
@@ -19,7 +19,7 @@
# import interfaces
from hypatia.interfaces import ICatalog
-from pyams_utils.interfaces import IKeyValue
+from pyams_utils.interfaces import ICacheKeyValue
from zope.intid.interfaces import IIntIds
# import packages
@@ -28,7 +28,7 @@
from zope.keyreference.interfaces import NotYet
-@adapter_config(context=ICatalog, provides=IKeyValue)
+@adapter_config(context=ICatalog, provides=ICacheKeyValue)
def catalog_key_adapter(obj):
"""Catalog key value adapter"""
return str(frozenset(obj))