Merge branch 'stable'

Author: nutrina

app/passport_score/gr15_scorer.py

@@ -1,27 +1,27 @@
-import datar.all as r
 # delay import as this is only available in celery envs
 import pandas as pd
-from datar.core.factory import func_factory
 
 
-@func_factory("agg", "x")
-def my_paste(x):
-    return ", ".join(x)
+def compute_apu_scores(
+    gc, stamp_field_names, grouping_fieldnames, grouping_fieldnames_1
+):
+    import datar.all as r
+    from datar.core.factory import func_factory
 
+    @func_factory("agg", "x")
+    def my_paste(x):
+        return ", ".join(x)
 
-@func_factory("agg", "x")
-def my_len(x):
-    return len(x)
 
+    @func_factory("agg", "x")
+    def my_len(x):
+        return len(x)
 
-@func_factory("agg", "x")
-def my_head(x, n=1):
-    return x[0:n]
 
+    @func_factory("agg", "x")
+    def my_head(x, n=1):
+        return x[0:n]
 
-def compute_apu_scores(
-    gc, stamp_field_names, grouping_fieldnames, grouping_fieldnames_1
-):
     grouping_fields = [r.f[fieldname] for fieldname in grouping_fieldnames]
     grouping_fields_1 = [r.f[fieldname] for fieldname in grouping_fieldnames_1]
     stamp_fields = [r.f[fieldname] for fieldname in stamp_field_names]

requirements/base.txt

@@ -121,5 +121,3 @@ unidecode==1.2.0
 drf-flex-fields==0.9.1
 pandas==1.1.5
 django-svg-image-form-field==1.0.1
-datar==0.8.6
-pdtypes==0.0.4

requirements/test.txt

@@ -18,3 +18,5 @@ ipfshttpclient==0.6.0
 dj_static==0.0.6
 livereload==2.6.3
 didkit==0.2.1
+datar==0.8.6
+pdtypes==0.0.4

scripts/deploy.bash

@@ -44,8 +44,12 @@ git add .
 git stash
 
 # If no $BRANCH is specified, it will use the current one
+echo "- checkout $BRANCH"
 git checkout "$BRANCH"
-git pull origin "$BRANCH"
+echo "- fetch"
+git fetch origin $BRANCH 
+echo "- reset to origin/$BRANCH"
+git reset --hard "origin/$BRANCH"
 
 # deploy hooks
 echo "- install req"