Merge pull request #62 from ojonathacardoso/master

Release 3.0.4
interlegis · Sep 13, 2021 · 88cbcb3 · 88cbcb3
2 parents 4d176d1 + 4173974
commit 88cbcb3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/release.sh b/release.sh
@@ -15,6 +15,17 @@ NEXT_VERSION=$MAIN_REV'.'$NEXT_NUMBER
 
 FINAL_VERSION=
 
+function update_repo {
+
+   echo "Sincronizando e atualizando repositório local..."
+
+   git fetch upstream
+   git checkout master
+   git merge upstream/master
+
+   echo "Release atual: "$LATEST_VERSION
+}
+
 function change_files {
 
     echo "Atualizando de "$LATEST_VERSION" para "$NEXT_VERSION"..."
@@ -37,10 +48,11 @@ function commit_and_push {
 
    git push origin master
 
+   git push --tags
+
    echo "Concluído"
 }
 
-git fetch
-echo "Release atual: "$LATEST_VERSION
+update_repo
 change_files
 commit_and_push
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -31,9 +31,9 @@ git+git://github.com/interlegis/trml2pdf.git
 python-dateutil
 django-exclusivebooleanfield
 django-smart-selects
-social-auth-app-django
+social-auth-app-django==4
 pyjwkest
-psycopg2-binary
+psycopg2-binary==2.8.6
 bootstrap-admin
 django-easy-audit
 sqlparse==0.1.9

diff --git a/saap/settings.py b/saap/settings.py
@@ -57,7 +57,7 @@
 DADOS_SITE = config('DADOS_SITE');
 BRASAO_PROPRIO = config('BRASAO_PROPRIO');
 
-VERSION='3.0.3'
+VERSION='3.0.4'
 
 INSTALLED_APPS = (
     #'django_admin_bootstrapped',

diff --git a/saap/templates/base.html b/saap/templates/base.html
@@ -230,7 +230,7 @@ <h1 class="page-header">
                 <small>
                   Desenvolvido pelo <a href="http://www.interlegis.leg.br/">Interlegis</a> em software livre e aberto.
                 </small>
-                Release: 3.0.3
+                Release: 3.0.4
               </p>
             </div>
             <div class="col-1-3">

diff --git a/sync.sh b/sync.sh
@@ -0,0 +1,7 @@
+#/bin/bash
+
+git fetch upstream
+git checkout master
+git merge upstream/master
+git push origin master
+git push --tags