New style: update package config & use new style import
authorNsukami Patrick <ndkpatt at gmail dot com>
Tue, 05 Mar 2019 14:05:12 +0000
changeset 382 6b60ac372cdc
parent 381 8dfb6930c966
child 383 2f8add201e76
New style: update package config & use new style import - update MANIFEST.in - update cubicweb min version inside __pkginfo__.py - use new style import
MANIFEST.in
cubicweb_blog/__pkginfo__.py
cubicweb_blog/sobjects.py
cubicweb_blog/views/__init__.py
cubicweb_blog/views/entry.py
--- a/MANIFEST.in	Tue Mar 05 14:42:00 2019 +0100
+++ b/MANIFEST.in	Tue Mar 05 14:05:12 2019 +0000
@@ -1,7 +1,10 @@
-include setup.py
 include README
+include *.py
+include */*.py
+recursive-include cubicweb_blog *.py
+recursive-include cubicweb_blog/data *.gif *.png *.ico *.css *.js
+recursive-include cubicweb_blog/i18n *.po
+recursive-include test/data bootstrap_cubes *.py
 
-recursive-include cubicweb_blog *
-recursive-include cubicweb_blog/data *.gif *.jpg *.png *.css external_resources
-recursive-include cubicweb_blog/i18n *.po
-recursive-include cubicweb_blog/migration *.py
+recursive-include debian changelog compat control copyright rules
+include cubicweb-blog.spec
--- a/cubicweb_blog/__pkginfo__.py	Tue Mar 05 14:42:00 2019 +0100
+++ b/cubicweb_blog/__pkginfo__.py	Tue Mar 05 14:05:12 2019 +0000
@@ -20,7 +20,7 @@
     'Programming Language :: JavaScript',
 ]
 
-__depends__ = {'cubicweb': '>= 3.19.0',
+__depends__ = {'cubicweb': '>= 3.26.0',
                'six': '>= 1.4.0', }
 __recommends__ = {'cubicweb-tag': None,
                   'cubicweb-preview': None,
--- a/cubicweb_blog/sobjects.py	Tue Mar 05 14:42:00 2019 +0100
+++ b/cubicweb_blog/sobjects.py	Tue Mar 05 14:05:12 2019 +0000
@@ -21,7 +21,7 @@
     DCTERMS = rdflib.Namespace('http://purl.org/dc/terms/')
 
 try:
-    from cubes.datafeed.sobjects import DataFeedParser
+    from cubicweb_datafeed.sobjects import DataFeedParser
 except ImportError:
     DataFeedParser = None
 
--- a/cubicweb_blog/views/__init__.py	Tue Mar 05 14:42:00 2019 +0100
+++ b/cubicweb_blog/views/__init__.py	Tue Mar 05 14:05:12 2019 +0000
@@ -46,7 +46,7 @@
     loaded_cubes = vreg.config.cubes()
 
     if 'seo' in loaded_cubes:
-        from cubes.seo.views import SitemapRule
+        from cubicweb_seo.views import SitemapRule
 
         class BlogEntrySitemapRule(SitemapRule):
             __regid__ = 'blogentry'
@@ -64,7 +64,7 @@
         vreg.register(MicroBlogEntrySitemapRule)
 
     if 'preview' in loaded_cubes:
-        from cubes.preview.views.forms import PreviewFormMixin
+        from cubicweb_preview.views.forms import PreviewFormMixin
 
         class PreviewAutomaticEntityForm(PreviewFormMixin, AutomaticEntityForm):
             preview_mode = 'inline'
--- a/cubicweb_blog/views/entry.py	Tue Mar 05 14:42:00 2019 +0100
+++ b/cubicweb_blog/views/entry.py	Tue Mar 05 14:05:12 2019 +0000
@@ -180,7 +180,7 @@
         schema = self._cw.vreg.schema
         if 'comments' in schema and \
                 'BlogEntry' in schema.rschema('comments').objects():
-            from cubes.comment.entities import subcomments_count
+            from cubicweb_comment.entities import subcomments_count
             count = subcomments_count(entity)
             if count:
                 url = xml_escape(entity.absolute_url())