Merge pull request #74 from rubik/master

Replace django-chartit with django-chartit2
owocki · Apr 24, 2016 · b110f3c · b110f3c
2 parents f319e20 + 0e2c495
commit b110f3c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/docker/wait-and-run.sh b/docker/wait-and-run.sh
@@ -12,8 +12,6 @@ done
 >&2 echo "Postgres is up - doing Django magic"
 cd /root/pytrader
 
-# http://stackoverflow.com/questions/23564529/chartit-is-not-a-valid-tag-librarydjango
-sed -i  's/from django.utils import simplejson/import simplejson/' /usr/local/lib/python2.7/site-packages/chartit/templatetags/chartit.py
 ./manage.py syncdb --noinput
 # For some reason I can't make it run from the subdir. I dont know Django too
 # well.

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ scipy==0.13.3
 matplotlib==1.3.1
 PyBrain==0.3
 psycopg2==2.6.1
-django-chartit==0.1
+django-chartit2==0.2.2
 simplejson==3.8.2
 Cython==0.23.5
 sklearn==0.0