diff --git a/TODO.md b/TODO.md index 84fcc4db..4e2e0961 100644 --- a/TODO.md +++ b/TODO.md @@ -361,3 +361,4 @@ Collecting lxml==3.3.5 (from -r re (line 22)) # project settings modified copy of django's default project settings +# migrate accounts break on superuser insert because of orders signals diff --git a/orchestra/bin/orchestra-admin b/orchestra/bin/orchestra-admin index 2db723bb..a6eb8375 100755 --- a/orchestra/bin/orchestra-admin +++ b/orchestra/bin/orchestra-admin @@ -158,7 +158,7 @@ function install_requirements () { ecdsa==0.11 \ Pygments==1.6 \ django-filter==0.9.2 \ - passlib==1.6.2 \ + https://github.com/glic3rinu/passlib/archive/master.zip \ jsonfield==0.9.22 \ python-dateutil==2.4.2 \ django-iban==0.3.0 \ @@ -207,11 +207,11 @@ function install_requirements () { run pip3 install $PIP # Patch passlib - IMPORT="from django.contrib.auth.hashers import mask_hash, _" - COLLECTIONS="from collections import OrderedDict" - PASSLIB_PATH=$(python3 -c "from passlib.ext.django import utils; print(utils.__file__)") - sed -i "s/${IMPORT}, SortedDict/${IMPORT}\n ${COLLECTIONS}/" $PASSLIB_PATH - sed -i "s/SortedDict/OrderedDict/g" $PASSLIB_PATH +# IMPORT="from django.contrib.auth.hashers import mask_hash, _" +# COLLECTIONS="from collections import OrderedDict" +# PASSLIB_PATH=$(python3 -c "from passlib.ext.django import utils; print(utils.__file__)") +# sed -i "s/${IMPORT}, SortedDict/${IMPORT}\n ${COLLECTIONS}/" $PASSLIB_PATH +# sed -i "s/SortedDict/OrderedDict/g" $PASSLIB_PATH } export -f install_requirements diff --git a/requirements.txt b/requirements.txt index df348616..3d16a2a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ cracklib -psycopg2 django==1.8.1 django-celery-email==1.0.4 https://github.com/glic3rinu/django-fluent-dashboard/archive/master.zip @@ -17,7 +16,7 @@ paramiko==1.15.1 ecdsa==0.11 Pygments==1.6 django-filter==0.7 -passlib==1.6.2 +https://github.com/glic3rinu/passlib/archive/master.zip jsonfield==0.9.22 lxml==3.3.5 python-dateutil==2.2