# HG changeset patch # User Denis Laxalde # Date 1467028318 -7200 # Node ID 88446b0c6ea111a00b69db8407eade5966620f01 # Parent 057ad6b9c1329998e27763fc6b4cbe2bcd8bf2cf# Parent aaa77d16993a2387ffbeb6375029997c706fc3bf Merge with 3.23 diff -r 057ad6b9c132 -r 88446b0c6ea1 .hgtags --- a/.hgtags Fri Jun 24 11:12:36 2016 +0200 +++ b/.hgtags Mon Jun 27 13:51:58 2016 +0200 @@ -557,3 +557,12 @@ b1e7de00053628968ea364ee9044fb4f8714fb50 3.22.3 b1e7de00053628968ea364ee9044fb4f8714fb50 debian/3.22.3-1 b1e7de00053628968ea364ee9044fb4f8714fb50 centos/3.22.3-1 +93b0f836cb075df970236b14f2128478c8b4bcbc 3.23.0 +93b0f836cb075df970236b14f2128478c8b4bcbc centos/3.23.0-1 +93b0f836cb075df970236b14f2128478c8b4bcbc debian/3.23.0-1 +93b0f836cb075df970236b14f2128478c8b4bcbc 3.23.0 +4b07f2a79021697f8a88a4665a6c957d540147bb 3.23.0 +93b0f836cb075df970236b14f2128478c8b4bcbc centos/3.23.0-1 +4b07f2a79021697f8a88a4665a6c957d540147bb centos/3.23.0-1 +93b0f836cb075df970236b14f2128478c8b4bcbc debian/3.23.0-1 +4b07f2a79021697f8a88a4665a6c957d540147bb debian/3.23.0-1 diff -r 057ad6b9c132 -r 88446b0c6ea1 __pkginfo__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/__pkginfo__.py Mon Jun 27 13:51:58 2016 +0200 @@ -0,0 +1,1 @@ +cubicweb/__pkginfo__.py \ No newline at end of file diff -r 057ad6b9c132 -r 88446b0c6ea1 cubicweb/i18n/de.po --- a/cubicweb/i18n/de.po Fri Jun 24 11:12:36 2016 +0200 +++ b/cubicweb/i18n/de.po Mon Jun 27 13:51:58 2016 +0200 @@ -753,6 +753,9 @@ msgid "Submit bug report by mail" msgstr "Diesen Bericht als E-Mail senden" +msgid "Synchronization has been requested, refresh this page in a few minutes." +msgstr "" + msgid "TZDatetime" msgstr "" @@ -1041,6 +1044,9 @@ msgid "add CWAttribute update_permission RQLExpression subject" msgstr "RQL-Ausdruck für Berechtigung zum Aktualisieren" +msgid "add CWComputedRType read_permission RQLExpression subject" +msgstr "" + msgid "add CWEType add_permission RQLExpression subject" msgstr "RQL-Ausdruck für Berechtigung zum Hinzufügen" @@ -1791,6 +1797,11 @@ msgstr "RQL Ausdruck für Aktualisierungs-Berechtigung für %(linkto)s" msgid "" +"creating RQLExpression (CWComputedRType %(linkto)s read_permission " +"RQLExpression)" +msgstr "" + +msgid "" "creating RQLExpression (CWEType %(linkto)s add_permission RQLExpression)" msgstr "Erstelle rql-Ausdruck für Hinzufüge-Berechtigung für %(linkto)s" @@ -2433,9 +2444,6 @@ msgid "edit bookmarks" msgstr "Lesezeichen bearbeiten" -msgid "edit canceled" -msgstr "Änderungen verwerfen" - msgid "editable-table" msgstr "bearbeitbare Tabelle" @@ -3596,6 +3604,10 @@ msgid "read_permission" msgstr "Leseberechtigung" +msgctxt "CWComputedRType" +msgid "read_permission" +msgstr "" + msgctxt "CWEType" msgid "read_permission" msgstr "Leseberechtigung" @@ -4091,6 +4103,9 @@ msgid "synchronization-interval must be greater than 1 minute" msgstr "" +msgid "synchronize" +msgstr "" + msgid "table" msgstr "Tabelle" @@ -4124,11 +4139,6 @@ msgid "the system source has its configuration stored on the file-system" msgstr "" -#, python-format -msgid "the value \"%s\" is already used, use another one" -msgstr "" -"Der Wert \"%s\" wird bereits benutzt, bitte verwenden Sie einen anderen Wert" - msgid "there is no next page" msgstr "" @@ -4678,6 +4688,9 @@ #~ msgid "components_etypenavigation_description" #~ msgstr "Erlaubt die Sortierung von Suchergebnissen nach Entitätstyp" +#~ msgid "edit canceled" +#~ msgstr "Änderungen verwerfen" + #~ msgid "error while querying source %s, some data may be missing" #~ msgstr "" #~ "Fehler beim Zugriff auf Quelle %s, möglicherweise sind die Daten " @@ -4686,5 +4699,10 @@ #~ msgid "no edited fields specified for entity %s" #~ msgstr "kein Eingabefeld spezifiziert Für Entität %s" +#~ msgid "the value \"%s\" is already used, use another one" +#~ msgstr "" +#~ "Der Wert \"%s\" wird bereits benutzt, bitte verwenden Sie einen anderen " +#~ "Wert" + #~ msgid "timeline" #~ msgstr "Zeitleiste" diff -r 057ad6b9c132 -r 88446b0c6ea1 cubicweb/i18n/en.po --- a/cubicweb/i18n/en.po Fri Jun 24 11:12:36 2016 +0200 +++ b/cubicweb/i18n/en.po Mon Jun 27 13:51:58 2016 +0200 @@ -729,6 +729,9 @@ msgid "Submit bug report by mail" msgstr "" +msgid "Synchronization has been requested, refresh this page in a few minutes." +msgstr "" + msgid "TZDatetime" msgstr "International date and time" @@ -1003,6 +1006,9 @@ msgid "add CWAttribute update_permission RQLExpression subject" msgstr "rql expression for update permission" +msgid "add CWComputedRType read_permission RQLExpression subject" +msgstr "rql expression for read permission" + msgid "add CWEType add_permission RQLExpression subject" msgstr "rql expression for add permission" @@ -1746,6 +1752,11 @@ msgstr "RQL expression granting update permission on %(linkto)s" msgid "" +"creating RQLExpression (CWComputedRType %(linkto)s read_permission " +"RQLExpression)" +msgstr "creating rql expression for read permission on %(linkto)s" + +msgid "" "creating RQLExpression (CWEType %(linkto)s add_permission RQLExpression)" msgstr "creating rql expression for add permission on %(linkto)s" @@ -2382,9 +2393,6 @@ msgid "edit bookmarks" msgstr "" -msgid "edit canceled" -msgstr "" - msgid "editable-table" msgstr "" @@ -3513,6 +3521,10 @@ msgid "read_permission" msgstr "read permission" +msgctxt "CWComputedRType" +msgid "read_permission" +msgstr "" + msgctxt "CWEType" msgid "read_permission" msgstr "read permission" @@ -3994,6 +4006,9 @@ msgid "synchronization-interval must be greater than 1 minute" msgstr "" +msgid "synchronize" +msgstr "" + msgid "table" msgstr "" @@ -4027,10 +4042,6 @@ msgid "the system source has its configuration stored on the file-system" msgstr "" -#, python-format -msgid "the value \"%s\" is already used, use another one" -msgstr "" - msgid "there is no next page" msgstr "" diff -r 057ad6b9c132 -r 88446b0c6ea1 cubicweb/i18n/es.po --- a/cubicweb/i18n/es.po Fri Jun 24 11:12:36 2016 +0200 +++ b/cubicweb/i18n/es.po Mon Jun 27 13:51:58 2016 +0200 @@ -763,6 +763,9 @@ msgid "Submit bug report by mail" msgstr "Enviar este reporte por email" +msgid "Synchronization has been requested, refresh this page in a few minutes." +msgstr "" + msgid "TZDatetime" msgstr "Fecha y hora internacional" @@ -1060,6 +1063,9 @@ msgid "add CWAttribute update_permission RQLExpression subject" msgstr "Permiso de actualización" +msgid "add CWComputedRType read_permission RQLExpression subject" +msgstr "" + msgid "add CWEType add_permission RQLExpression subject" msgstr "Expresión RQL de agregación" @@ -1826,6 +1832,11 @@ "creación de una expresión RQL por el derecho de actualización de %(linkto)s" msgid "" +"creating RQLExpression (CWComputedRType %(linkto)s read_permission " +"RQLExpression)" +msgstr "" + +msgid "" "creating RQLExpression (CWEType %(linkto)s add_permission RQLExpression)" msgstr "" "Creación de una expresión RQL para la autorización de agregar %(linkto)s" @@ -2486,9 +2497,6 @@ msgid "edit bookmarks" msgstr "Editar favoritos" -msgid "edit canceled" -msgstr "Edición cancelada" - msgid "editable-table" msgstr "Tabla modificable" @@ -3649,6 +3657,10 @@ msgid "read_permission" msgstr "Permiso de Lectura" +msgctxt "CWComputedRType" +msgid "read_permission" +msgstr "" + msgctxt "CWEType" msgid "read_permission" msgstr "Permiso de Lectura" @@ -4155,6 +4167,9 @@ msgid "synchronization-interval must be greater than 1 minute" msgstr "synchronization-interval debe ser mayor a 1 minuto" +msgid "synchronize" +msgstr "" + msgid "table" msgstr "Tabla" @@ -4189,10 +4204,6 @@ msgstr "" "el sistema fuente tiene su configuración almacenada en el sistema de archivos" -#, python-format -msgid "the value \"%s\" is already used, use another one" -msgstr "El valor \"%s\" ya esta en uso, favor de utilizar otro" - msgid "there is no next page" msgstr "no existe página siguiente" @@ -4755,6 +4766,9 @@ #~ msgid "components_etypenavigation_description" #~ msgstr "Permite filtrar por tipo de entidad los resultados de una búsqueda" +#~ msgid "edit canceled" +#~ msgstr "Edición cancelada" + #~ msgid "error while querying source %s, some data may be missing" #~ msgstr "" #~ "Un error ha ocurrido al interrogar %s, es posible que los \n" @@ -4768,6 +4782,9 @@ #~ msgid "no edited fields specified for entity %s" #~ msgstr "Ningún campo editable especificado para la entidad %s" +#~ msgid "the value \"%s\" is already used, use another one" +#~ msgstr "El valor \"%s\" ya esta en uso, favor de utilizar otro" + #~ msgid "timeline" #~ msgstr "Escala de Tiempo" diff -r 057ad6b9c132 -r 88446b0c6ea1 cubicweb/i18n/fr.po --- a/cubicweb/i18n/fr.po Fri Jun 24 11:12:36 2016 +0200 +++ b/cubicweb/i18n/fr.po Mon Jun 27 13:51:58 2016 +0200 @@ -759,6 +759,11 @@ msgid "Submit bug report by mail" msgstr "Soumettre ce rapport par email" +msgid "Synchronization has been requested, refresh this page in a few minutes." +msgstr "" +"La demande de synchronisation a été soumise, rafraichir cette page d'ici " +"quelques minutes" + msgid "TZDatetime" msgstr "Date et heure internationale" @@ -1056,6 +1061,9 @@ msgid "add CWAttribute update_permission RQLExpression subject" msgstr "permission de mise à jour" +msgid "add CWComputedRType read_permission RQLExpression subject" +msgstr "permission de lecture" + msgid "add CWEType add_permission RQLExpression subject" msgstr "définir une expression RQL d'ajout" @@ -1824,6 +1832,11 @@ "création d'une expression rql pour le droit de mise à jour de %(linkto)s" msgid "" +"creating RQLExpression (CWComputedRType %(linkto)s read_permission " +"RQLExpression)" +msgstr "creation d'une expression rql pour le droit en lecture de %(linkto)s" + +msgid "" "creating RQLExpression (CWEType %(linkto)s add_permission RQLExpression)" msgstr "création d'une expression RQL pour la permission d'ajout de %(linkto)s" @@ -2483,9 +2496,6 @@ msgid "edit bookmarks" msgstr "éditer les signets" -msgid "edit canceled" -msgstr "édition annulée" - msgid "editable-table" msgstr "table éditable" @@ -3648,6 +3658,10 @@ msgid "read_permission" msgstr "permission de lire" +msgctxt "CWComputedRType" +msgid "read_permission" +msgstr "" + msgctxt "CWEType" msgid "read_permission" msgstr "permission de lire" @@ -4154,6 +4168,9 @@ msgid "synchronization-interval must be greater than 1 minute" msgstr "synchronization-interval doit être supérieur à 1 minute" +msgid "synchronize" +msgstr "synchroniser" + msgid "table" msgstr "table" @@ -4187,10 +4204,6 @@ msgid "the system source has its configuration stored on the file-system" msgstr "la source système a sa configuration stockée sur le système de fichier" -#, python-format -msgid "the value \"%s\" is already used, use another one" -msgstr "la valeur \"%s\" est déjà utilisée, veuillez utiliser une autre valeur" - msgid "there is no next page" msgstr "Il n'y a pas de page suivante" @@ -4567,7 +4580,8 @@ #, python-format msgid "value %(KEY-value)s must be < %(KEY-boundary)s" -msgstr "la valeur %(KEY-value)s doit être strictement inférieure à %(KEY-boundary)s" +msgstr "" +"la valeur %(KEY-value)s doit être strictement inférieure à %(KEY-boundary)s" #, python-format msgid "value %(KEY-value)s must be <= %(KEY-boundary)s" @@ -4576,7 +4590,8 @@ #, python-format msgid "value %(KEY-value)s must be > %(KEY-boundary)s" -msgstr "la valeur %(KEY-value)s doit être strictement supérieure à %(KEY-boundary)s" +msgstr "" +"la valeur %(KEY-value)s doit être strictement supérieure à %(KEY-boundary)s" #, python-format msgid "value %(KEY-value)s must be >= %(KEY-boundary)s" @@ -4723,3 +4738,10 @@ msgid "you should probably delete that property" msgstr "vous devriez probablement supprimer cette propriété" + +#~ msgid "edit canceled" +#~ msgstr "édition annulée" + +#~ msgid "the value \"%s\" is already used, use another one" +#~ msgstr "" +#~ "la valeur \"%s\" est déjà utilisée, veuillez utiliser une autre valeur" diff -r 057ad6b9c132 -r 88446b0c6ea1 debian/control --- a/debian/control Fri Jun 24 11:12:36 2016 +0200 +++ b/debian/control Mon Jun 27 13:51:58 2016 +0200 @@ -11,7 +11,7 @@ python-six (>= 1.4.0), python-sphinx, python-logilab-common (>= 1.2.2), - python-unittest2 (>= 0.7.0), + python-unittest2, python-logilab-mtconverter, python-markdown, python-tz, @@ -207,6 +207,7 @@ cubicweb-server (= ${source:Version}), cubicweb-web (= ${source:Version}), cubicweb-twisted (= ${source:Version}), + python-unittest2 (>= 0.7.0), python-pysqlite2 Suggests: w3c-dtd-xhtml, diff -r 057ad6b9c132 -r 88446b0c6ea1 doc/_themes/cubicweb/static/cubicweb.ico --- a/doc/_themes/cubicweb/static/cubicweb.ico Fri Jun 24 11:12:36 2016 +0200 +++ b/doc/_themes/cubicweb/static/cubicweb.ico Mon Jun 27 13:51:58 2016 +0200 @@ -1,1 +1,1 @@ -../../../../web/data/favicon.ico \ No newline at end of file +../../../../cubicweb/web/data/favicon.ico \ No newline at end of file diff -r 057ad6b9c132 -r 88446b0c6ea1 doc/_themes/cubicweb/static/logo-cubicweb.svg --- a/doc/_themes/cubicweb/static/logo-cubicweb.svg Fri Jun 24 11:12:36 2016 +0200 +++ b/doc/_themes/cubicweb/static/logo-cubicweb.svg Mon Jun 27 13:51:58 2016 +0200 @@ -1,1 +1,1 @@ -../../../../web/data/logo-cubicweb.svg \ No newline at end of file +../../../../cubicweb/web/data/logo-cubicweb.svg \ No newline at end of file diff -r 057ad6b9c132 -r 88446b0c6ea1 doc/changes/3.23.rst --- a/doc/changes/3.23.rst Fri Jun 24 11:12:36 2016 +0200 +++ b/doc/changes/3.23.rst Mon Jun 27 13:51:58 2016 +0200 @@ -1,19 +1,22 @@ -3.23 (UNRELEASED) -================= +3.23 (24 June 2016) +=================== -Backwards-incompatible changes ------------------------------- +New features +------------ -* Generative tests *à la logilab-common* are not supported anymore in - `CubicWebTC`. It is advised to use the subtests_ API (available on - `CubicWebTC` either from the standard library as of Python 3.4 or through - unittest2 package otherwise). +* Python 3.x support in CubicWeb itself is now complete, except for the + twisted package (since Twisted does not completely support Python 3.x + itself). The skeleton for new cube should also be Python 3 compatible, in + particular its `setup.py` got updated. -* `CubicWebTC`'s `set_description` method (comming from - `logilab.common.testlib.TestCase`) is no longer available. +* The `source-sync` command can now synchronize all sources in the database, + if no `` argument is provided. + +* Datafeed source synchronization is now asynchronous when requested from user + interface. Database handling ------------------ +~~~~~~~~~~~~~~~~~ * Most indexes and constraints will be rebuilt during the migration, because they are now named after a md5 hash to control the name's size. @@ -30,7 +33,7 @@ Data-import ------------ +~~~~~~~~~~~ * Deprecated `MetaGenerator` in favor of slightly adapted API in `MetadataGenerator` (more consistent, giving more control to sub-classes and @@ -44,5 +47,19 @@ - added support for a metadata generator, the now recommended way to control metadata generation +* Deprecated `SQLGenObjectStore`, `MassiveObjectStore` should be used instead. + + +Backwards-incompatible changes +------------------------------ + +* Generative tests *à la logilab-common* are not supported anymore in + `CubicWebTC`. It is advised to use the subtests_ API (available on + `CubicWebTC` either from the standard library as of Python 3.4 or through + unittest2 package otherwise). + +* `CubicWebTC`'s `set_description` method (comming from + `logilab.common.testlib.TestCase`) is no longer available. + .. _subtests: https://docs.python.org/3/library/unittest.html#distinguishing-test-iterations-using-subtests