Merge branch '543_remove_google_analytics' into 'master'

Remove google analytics

Closes #543

See merge request !315

beat/web/navigation/context_processors.py

@@ -28,18 +28,13 @@
 from django.conf import settings
 from .. import __version__
 
+
 def exported_settings(request):
     return {
-        'URL_PREFIX': settings.URL_PREFIX,
-        'PREREGISTRATION_ONLY': settings.PREREGISTRATION_ONLY
+        "URL_PREFIX": settings.URL_PREFIX,
+        "PREREGISTRATION_ONLY": settings.PREREGISTRATION_ONLY,
     }
 
-def beat_version(request):
-    return {
-        'beat_version': __version__,
-    }
 
-def google_analytics(request):
-    return {
-        'google_analytics': getattr(settings, 'GOOGLE_ANALYTICS_KEY'),
-    }
+def beat_version(request):
+    return {"beat_version": __version__}

beat/web/templates/base.html

@@ -110,18 +110,5 @@ $(document).ready(function() {
 });
   </script>
 
-  {# google analytics #}
-  {% if google_analytics %}
-  <script type="text/javascript">
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', '{{ google_analytics }}', 'auto');
-    ga('send', 'pageview');
-  </script>
-  {% endif %}
-
 </body>
 </html>

dev.yml

@@ -8,13 +8,13 @@ dependencies:
 
   # packages you may pin are here
   - python=3.6
-  - bob-devel=2019.08.28
-  - beat-devel=2019.08.28
+  - bob-devel=2020.01.09
+  - beat-devel=2020.01.09
 
   # beat dependencies matching release.cfg
-  - beat.core=1.9.0
-  - beat.backend.python=1.7.2
-  - beat.cmdline=1.5.0
+  - beat.core=1.9.2
+  - beat.backend.python=1.7.3
+  - beat.cmdline=1.6.1
 
   # requirements.txt, they are indirectly pinned through the above
   - docopt

release.cfg

@@ -24,9 +24,9 @@ eggs = ${buildout:eggs}
 interpreter = python
 
 [sources]
-beat.core = git https://gitlab.idiap.ch/beat/beat.core.git rev=v1.9.0
-beat.cmdline = git https://gitlab.idiap.ch/beat/beat.cmdline.git rev=v1.5.0
-beat.backend.python = git https://gitlab.idiap.ch/beat/beat.backend.python.git rev=v1.7.2
+beat.core = git https://gitlab.idiap.ch/beat/beat.core.git rev=v1.9.2
+beat.cmdline = git https://gitlab.idiap.ch/beat/beat.cmdline.git rev=v1.6.1
+beat.backend.python = git https://gitlab.idiap.ch/beat/beat.backend.python.git rev=v1.7.3
 
 [uwsgi]
 recipe = buildout.recipe.uwsgi