Merge branch 'hotfix/2.0.6' into testing

CHANGES.txt

@@ -1,6 +1,13 @@
 Change History
 ==============
 
+2.0.6 - 2021-05-12
+------------------
+
+- Fix performance issue: ``Content._tags`` is configured with ``lazy="select"`` now.
+  This doesn't cause any change in API usage, however it speeds up selects on ``Node`` and descendants by 1-2 orders of magnitude in some cases at the price of a slight performance degradation in scenarios with few tables and heavy tag usage.
+- Update dependencies to their most recent compatible versions.
+
 2.0.5 - 2021-03-16
 ------------------
 

kotti/resources.py

@@ -632,7 +632,6 @@ def __mapper_args__(cls):
     _tags = relation(
         TagsToContents,
         backref=backref("item"),
-        lazy="joined",
         order_by=[TagsToContents.position],
         collection_class=ordering_list("position"),
         cascade="all, delete-orphan",

requirements.txt

@@ -1,21 +1,20 @@
-alembic==1.4.3
-anyascii==0.1.7
-appdirs==1.4.4
-Babel==2.9.0
+alembic==1.6.2
+anyascii==0.2.0
+Babel==2.9.1
 Beaker==1.11.0
 bleach==3.3.0
 bleach-allowlist==1.0.3
-Chameleon==3.8.1
-click==7.1.2
-colander==1.8.2
+Chameleon==3.9.0
+click==8.0.0
+colander==1.8.3
 deform==2.0.14
 docopt==0.6.2
 fanstatic==1.1
 filedepot==0.8.0
 FormEncode==2.0.0
 html2text==2020.1.16
 hupper==1.10.2
-iso8601==0.1.13
+iso8601==0.1.14
 js.angular==1.1.4
 js.bootstrap==3.3.4
 js.deform==2.0.14
@@ -34,17 +33,17 @@ js.modernizr==2.5.3.1
 js.select2==4.0.4.post1
 js.tinymce==4.5.4
 lingua==4.14
-Mako==1.1.3
-MarkupSafe==1.1.1
-packaging==20.4
+Mako==1.1.4
+MarkupSafe==2.0.0
+packaging==20.9
 PasteDeploy==2.1.1
 peppercorn==0.6
 plaster==1.0
 plaster-pastedeploy==0.7
-polib==1.1.0
+polib==1.1.1
 py-bcrypt==0.4
 pyparsing==2.4.7
-pyramid==1.10.5
+pyramid==1.10.8
 pyramid-beaker==0.8
 pyramid-chameleon==0.3
 pyramid-deform==0.2
@@ -53,30 +52,28 @@ pyramid-tm==2.4
 pyramid-zcml==1.2.0
 python-dateutil==2.8.1
 python-editor==1.0.4
-pytz==2020.4
+pytz==2021.1
 repoze.lru==0.7
 repoze.sendmail==4.4.1
 repoze.workflow==1.1
 repoze.zcml==1.1
 shutilwhich==1.1.0
-six==1.15.0
-SQLAlchemy==1.3.20
-SQLAlchemy-Utils==0.36.8
-transaction==3.0.0
+six==1.16.0
+SQLAlchemy==1.3.24
+SQLAlchemy-Utils==0.37.2
+transaction==3.0.1
 translationstring==1.4
-Unidecode==1.1.1
+Unidecode==1.2.0
 venusian==3.0.0
-waitress==1.4.4
+waitress==2.0.0
 webencodings==0.5.1
-WebOb==1.8.6
-zope.component==4.6.2
+WebOb==1.8.7
+zope.component==5.0.0
 zope.configuration==4.4.0
-zope.deferredimport==4.3.1
 zope.deprecation==4.4.0
 zope.event==4.5.0
 zope.hookable==5.0.1
 zope.i18nmessageid==5.0.1
-zope.interface==5.2.0
-zope.proxy==4.3.5
-zope.schema==6.0.0
-zope.sqlalchemy==1.3
+zope.interface==5.4.0
+zope.schema==6.1.0
+zope.sqlalchemy==1.4

setup.py

@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.0.5'
+version = '2.0.6'
 description = "A high-level, Pythonic web application framework based on " \
               "Pyramid and SQLAlchemy.  It includes an extensible Content " \
               "Management System called the Kotti CMS."
@@ -143,6 +143,7 @@ def read(*parts):
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
+          'Programming Language :: Python :: 3.9',
           'Programming Language :: Python :: Implementation',
           'Programming Language :: Python :: Implementation :: CPython',
           # 'Programming Language :: Python :: Implementation :: PyPy',