Merge branch 'master' of https://github.com/interlegis/sigi

README.md

@@ -11,21 +11,20 @@ Installation
 ---------------
 Faça o checkout do projeto
  
-        $ git clone https://github.com/interlegis/sigi.git 
+        $ git clone git@github.com:interlegis/sigi.git
 
-Instalando as dependências do arquivo `requirements.txt`
+Instale as bibliotecas de sistema necessárias para usar o python-ldap
+(vide http://www.python-ldap.org/doc/html/installing.html#prerequisites)
 
-        $ pip install -r requirements.txt
+        $ sudo apt-get install python-dev libldap2-dev libssl-dev libsasl2-dev
 
-Install django-googlecharts
+Instale as dependências do arquivo `requirements.txt`
 
-        $ git clone git://github.com/jacobian/django-googlecharts.git
+        $ pip install -r requirements.txt
-        $ cd django-googlecharts
-        $ python setup.py install
 
 Install a app de reports generator
 
-        $ git clone https://github.com/marinho/geraldo.git
+        $ git clone git@github.com:marinho/geraldo.git
         $ cd geraldo
         $ python setup.py install
         $ cp -Rfv reporting geraldo `python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`

install.sh

@@ -23,15 +23,8 @@ source ./env/bin/activate
 echo "Isolando arquivos temporários..."
 mkdir tmp
 
-echo "Instalando django-googlecharts..."
-cd tmp/
-git clone git://github.com/jacobian/django-googlecharts.git
-cd django-googlecharts
-python setup.py install
-cd ..
-
 echo "Instalando geraldo reports..."
-git clone https://github.com/marinho/geraldo.git
+git clone git@github.com:marinho/geraldo.git
 cd geraldo
 python setup.py install
 cp -Rfv reporting geraldo `python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`

requirements.txt

@@ -4,7 +4,7 @@ Pillow==2.5.1
 django-auth-ldap==1.2.0
 django-autoslug==1.7.2
 django-extensions==1.3.8
-django-googlecharts==1.0-alpha-1
+git+git://github.com/jacobian/django-googlecharts.git@c542996cf9a7a097b447e1ce5a1a6b66bdad254f#egg=django_googlecharts-master
 django-localflavor==1.0
 django-treemenus==0.9.1
 eav-django==1.4.5