Upgrade some depedencies and apply fixes according to

requirements/install.pip

@@ -1,10 +1,10 @@
-awesome-slugify==1.6
+awesome-slugify==1.6.2
 blinker==1.3
 celery==3.1.17
-celerybeat-mongo==0.0.7
+celerybeat-mongo==0.0.8
 cssmin==0.2.0
-elasticsearch==1.3.0
-Fiona==1.4.8
+elasticsearch==1.4.0
+Fiona==1.5.1
 Flask-Assets==0.10
 Flask-BabelEx==0.9.2
 Flask-Cache==0.13.1
@@ -15,29 +15,26 @@ Flask-Mail==0.9.1
 Flask-Markdown==0.3
 flask-mongoengine==0.7.1
 Flask-Navigation==0.2.0
-Flask-OAuthlib==0.7.0
+Flask-OAuthlib==0.9.1
 flask-restplus==0.7.1
 Flask-Script==2.0.5
 Flask-Security==1.7.4
 Flask-SuperAdmin==1.7.1
 Flask-Themes2==0.1.3
 Flask-Uploads==0.1.3
-Flask-WTF==0.10.3
+Flask-WTF==0.11.0
 Flask==0.10.1
 mdx-linkify==0.6
+mongoengine==0.9.0
 pillow
 py-bcrypt==0.4
-python-dateutil==2.2
+python-dateutil==2.4.2
 pytz
 PyYAML==3.11
 redis
 requests
-Shapely==1.4.4
-unicodecsv==0.9.4
+Shapely==1.5.7
+unicodecsv==0.11.0
 webassets==0.10.1
-wtforms-json==0.2.9
-wtforms==2.0.1
-
-# Until release of MongoEngine 0.9 with MultiPolygon support
-# mongoengine==0.8.7
-http://github.com/MongoEngine/mongoengine/tarball/759f721
+wtforms-json==0.2.10
+wtforms==2.0.2

udata/core/site/models.py

@@ -4,7 +4,7 @@
 from udata.models import db, WithMetrics
 
 
-__all__ = ('Site', )
+__all__ = ('Site', 'SiteSettings')
 
 
 DEFAULT_FEED_SIZE = 20

udata/core/topic/forms.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from udata.forms import UserModelForm, fields, validators, widgets
+from udata.forms import UserModelForm, fields, validators
 from udata.i18n import lazy_gettext as _
 
 from .models import Topic
@@ -19,6 +19,5 @@ class TopicForm(UserModelForm):
     datasets = fields.DatasetListField(_('Associated datasets'))
     reuses = fields.ReuseListField(_('Associated reuses'))
 
-    query = fields.StringField(_('Search Query'))
     tags = fields.TagField(_('Tags'), [validators.required()])
     private = fields.BooleanField(_('Private'))

udata/tests/factories.py

@@ -94,12 +94,18 @@ def geometry_collection(self):
 faker.add_provider(GeoJsonProvider)
 
 
+class SiteSettingsFactory(MongoEngineFactory):
+    class Meta:
+        model = models.SiteSettings
+
+
 class SiteFactory(MongoEngineFactory):
     class Meta:
         model = models.Site
 
     id = factory.LazyAttribute(lambda o: faker.word())
     title = factory.LazyAttribute(lambda o: faker.name())
+    settings = factory.SubFactory(SiteSettingsFactory)
 
 
 class UserFactory(MongoEngineFactory):

udata/tests/site/test_site_api.py

@@ -7,6 +7,7 @@
 
 from udata.core.site.models import Site
 from udata.core.site.metrics import SiteMetric
+from udata.core.site.views import current_site
 from udata.models import db, WithMetrics
 
 from udata.tests.api import APITestCase
@@ -48,11 +49,11 @@ def test_get_site(self):
         self.assert200(response)
 
     def test_get_home_datasets(self):
-        self.app.config['SITE_ID']
-        site = SiteFactory(
+        site = SiteFactory.create(
             id=self.app.config['SITE_ID'],
             settings__home_datasets=VisibleDatasetFactory.create_batch(3)
         )
+        current_site.reload()
 
         self.login(AdminFactory())
         response = self.get(url_for('api.home_datasets'))
@@ -61,11 +62,11 @@ def test_get_home_datasets(self):
         self.assertEqual(len(response.json), len(site.settings.home_datasets))
 
     def test_get_home_reuses(self):
-        self.app.config['SITE_ID']
-        site = SiteFactory(
+        site = SiteFactory.create(
             id=self.app.config['SITE_ID'],
             settings__home_reuses=VisibleReuseFactory.create_batch(3)
         )
+        current_site.reload()
 
         self.login(AdminFactory())
         response = self.get(url_for('api.home_reuses'))
@@ -82,7 +83,6 @@ def test_set_home_datasets(self):
         self.assert200(response)
         self.assertEqual(len(response.json), len(ids))
 
-        self.app.config['SITE_ID']
         site = Site.objects.get(id=self.app.config['SITE_ID'])
 
         self.assertEqual([d.id for d in site.settings.home_datasets], ids)
@@ -96,7 +96,6 @@ def test_set_home_reuses(self):
         self.assert200(response)
         self.assertEqual(len(response.json), len(ids))
 
-        self.app.config['SITE_ID']
         site = Site.objects.get(id=self.app.config['SITE_ID'])
 
         self.assertEqual([r.id for r in site.settings.home_reuses], ids)

udata/tests/workers/test_workers_api.py

@@ -41,7 +41,7 @@ def test_job():
                 'task': 'a-job'
             }
             if i % 2:
-                params['crontab'] = PeriodicTask.Crontab(minutes=i)
+                params['crontab'] = PeriodicTask.Crontab(minute=str(i))
             else:
                 params['interval'] = PeriodicTask.Interval(every=i, period='minutes')
             PeriodicTask.objects.create(**params)
@@ -153,7 +153,7 @@ def test_job():
             name=faker.name(),
             description=faker.sentence(),
             task='a-job',
-            crontab=PeriodicTask.Crontab(minutes=5)
+            crontab=PeriodicTask.Crontab(minute='5')
         )
 
         response = self.get(url_for('api.job', id=task.id))
@@ -172,7 +172,7 @@ def test_job():
             name=faker.name(),
             description=faker.sentence(),
             task='a-job',
-            crontab=PeriodicTask.Crontab(minutes=5)
+            crontab=PeriodicTask.Crontab(minute='5')
         )
 
         self.login()
@@ -193,7 +193,7 @@ def test_job():
             name=faker.name(),
             description=faker.sentence(),
             task='a-job',
-            crontab=PeriodicTask.Crontab(minutes=5)
+            crontab=PeriodicTask.Crontab(minute='5')
         )
 
         self.login(AdminFactory())
@@ -221,7 +221,7 @@ def test_job():
             name=faker.name(),
             description=faker.sentence(),
             task='a-job',
-            crontab=PeriodicTask.Crontab(minutes=5)
+            crontab=PeriodicTask.Crontab(minute='5')
         )
 
         self.login(AdminFactory())
@@ -253,7 +253,7 @@ def test_job():
             name=faker.name(),
             description=faker.sentence(),
             task='a-job',
-            crontab=PeriodicTask.Crontab(minutes=5)
+            crontab=PeriodicTask.Crontab(minute='5')
         )
 
         self.login()
@@ -269,7 +269,7 @@ def test_job():
             name=faker.name(),
             description=faker.sentence(),
             task='a-job',
-            crontab=PeriodicTask.Crontab(minutes=5)
+            crontab=PeriodicTask.Crontab(minute='5')
         )
 
         self.login(AdminFactory())