From c63a3c9dc928566f80858e6891b0aabd801f2859 Mon Sep 17 00:00:00 2001
From: Jonatha Cardoso <jonatha-cardoso@camaranh.rs.gov.br>
Date: Mon, 13 Sep 2021 14:14:06 -0300
Subject: [PATCH 1/2] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20de=2013/09/2021?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-> modified:   requirements/requirements.txt
Definição das versões dos pacotes social-auth-app-django e psycopg2-binary
-> modified:   release.sh
Alteração no processo de criação e atualização de um release
---
 release.sh                    | 16 ++++++++++++++--
 requirements/requirements.txt |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/release.sh b/release.sh
index a0e57fd..f060f42 100755
--- 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
index 0c1d3c3..8c9d613 100644
--- 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

From 4173974a6af0dd68f0aef006e5062f131c879dd7 Mon Sep 17 00:00:00 2001
From: Jonatha Cardoso <jonatha-cardoso@camaranh.rs.gov.br>
Date: Mon, 13 Sep 2021 14:16:13 -0300
Subject: [PATCH 2/2] Release: 3.0.4

---
 saap/settings.py         | 2 +-
 saap/templates/base.html | 2 +-
 sync.sh                  | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100755 sync.sh

diff --git a/saap/settings.py b/saap/settings.py
index 2828071..f4a6ffc 100644
--- 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
index e363012..4692da2 100644
--- 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
new file mode 100755
index 0000000..e5f3ca4
--- /dev/null
+++ 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