From 2c13a13f8b6d564d11e2729bf7f19af92067a9eb Mon Sep 17 00:00:00 2001
From: Leandro Roberto <leandroroberto.br@gmail.com>
Date: Sat, 5 Jan 2019 01:00:19 -0200
Subject: [PATCH] bump pyyaml

---
 requirements/requirements.txt |  9 +++++----
 setup.py                      | 11 ++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index bb93e9f0e..3c4d2e135 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,7 +1,6 @@
 dj-database-url==0.4.1
 django-haystack==2.6.0
 django>=1.10,<1.11
-git+git://github.com/rubgombar1/django-admin-bootstrapped.git
 django-bootstrap3==7.0.1
 django-bower==5.2.0
 django-braces==1.9.0
@@ -14,15 +13,13 @@ django-floppyforms==1.6.2
 django-model-utils==3.1.1
 django-sass-processor==0.5.8
 djangorestframework==3.4.0
-git+git://github.com/jasperlittle/django-rest-framework-docs
 easy-thumbnails==2.5
 django-image-cropping==1.2
-git+git://github.com/interlegis/trml2pdf.git
 libsass==0.11.1
 psycopg2-binary==2.7.4
 python-decouple==3.0
 pytz==2016.4
-pyyaml==3.11
+pyyaml==4.2b1
 rtyaml==0.0.3
 textract==1.5.0
 unipath==1.1
@@ -34,3 +31,7 @@ WeasyPrint==0.42
 whoosh==2.7.4
 django-speedinfo==1.3.5
 django-reversion-compare==0.8.4
+
+git+git://github.com/interlegis/trml2pdf.git
+git+git://github.com/jasperlittle/django-rest-framework-docs
+git+git://github.com/rubgombar1/django-admin-bootstrapped.git
\ No newline at end of file
diff --git a/setup.py b/setup.py
index aa79dc5b8..6b7c5a248 100644
--- a/setup.py
+++ b/setup.py
@@ -12,11 +12,6 @@ install_requires = [
     'dj-database-url==0.4.1',
     'django-haystack==2.6.0',
     'django>=1.10,<1.11',
-    # TODO O django-admin-bootstrapped 2.5.7 não inseriu a mudança que permite
-    # a compatibilidade com Django 1.9+. A linha abaixo será mudada quando uma
-    # nova versão do django-admin-bootstrapped for lançada
-    # 'git+git://github.com/django-admin-bootstrapped/
-    #      django-admin-bootstrapped.git',
     'django-bootstrap3==7.0.1',
     'django-bower==5.2.0',
     'django-braces==1.9.0',
@@ -32,12 +27,11 @@ install_requires = [
     'drfdocs',
     'easy-thumbnails==2.5',
     'django-image-cropping==1.1.0',
-    # 'git+git://github.com/interlegis/trml2pdf.git',
     'libsass==0.11.1',
     'psycopg2==2.7.4',
     'python-decouple==3.0',
     'pytz==2016.4',
-    'pyyaml==3.11',
+    'pyyaml==4.2b1',
     'rtyaml==0.0.3',
     'textract==1.5.0',
     'unipath==1.1',
@@ -49,6 +43,9 @@ install_requires = [
     'whoosh==2.7.4',
     'django-speedinfo==1.3.5',
     'django-reversion-compare==0.8.4'
+    # 'git+git://github.com/interlegis/trml2pdf.git',
+    # 'git+git://github.com/jasperlittle/django-rest-framework-docs'
+    # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git''
 ]
 setup(
     name='interlegis-sapl',