pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Added tasks app

This commit is contained in:
Marc Aymerich 2015-05-03 20:13:27 +00:00
parent 933464d24c
commit b97160b935
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.md
View File

@ -361,3 +361,4 @@ Collecting lxml==3.3.5 (from -r re (line 22))
# project settings modified copy of django's default project settings # project settings modified copy of django's default project settings
# migrate accounts break on superuser insert because of orders signals

12
orchestra/bin/orchestra-admin
View File

@ -158,7 +158,7 @@ function install_requirements () {
ecdsa==0.11 \ ecdsa==0.11 \
Pygments==1.6 \ Pygments==1.6 \
django-filter==0.9.2 \ django-filter==0.9.2 \
passlib==1.6.2 \ https://github.com/glic3rinu/passlib/archive/master.zip \
jsonfield==0.9.22 \ jsonfield==0.9.22 \
python-dateutil==2.4.2 \ python-dateutil==2.4.2 \
django-iban==0.3.0 \ django-iban==0.3.0 \
@ -207,11 +207,11 @@ function install_requirements () {
run pip3 install $PIP run pip3 install $PIP
# Patch passlib # Patch passlib
IMPORT="from django.contrib.auth.hashers import mask_hash, _" # IMPORT="from django.contrib.auth.hashers import mask_hash, _"
COLLECTIONS="from collections import OrderedDict" # COLLECTIONS="from collections import OrderedDict"
PASSLIB_PATH=$(python3 -c "from passlib.ext.django import utils; print(utils.__file__)") # 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/${IMPORT}, SortedDict/${IMPORT}\n ${COLLECTIONS}/" $PASSLIB_PATH
sed -i "s/SortedDict/OrderedDict/g" $PASSLIB_PATH # sed -i "s/SortedDict/OrderedDict/g" $PASSLIB_PATH
} }
export -f install_requirements export -f install_requirements

3
requirements.txt
View File

@ -1,5 +1,4 @@
cracklib cracklib
psycopg2
django==1.8.1 django==1.8.1
django-celery-email==1.0.4 django-celery-email==1.0.4
https://github.com/glic3rinu/django-fluent-dashboard/archive/master.zip https://github.com/glic3rinu/django-fluent-dashboard/archive/master.zip
@ -17,7 +16,7 @@ paramiko==1.15.1
ecdsa==0.11 ecdsa==0.11
Pygments==1.6 Pygments==1.6
django-filter==0.7 django-filter==0.7
passlib==1.6.2 https://github.com/glic3rinu/passlib/archive/master.zip
jsonfield==0.9.22 jsonfield==0.9.22
lxml==3.3.5 lxml==3.3.5
python-dateutil==2.2 python-dateutil==2.2