From 1717e7fe6ee439a67668a54f8200348fef1f6d22 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 25 Sep 2016 01:10:45 +0200
Subject: [PATCH 1/4] Ignore PyCharm files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 79f6256..b2b9bd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ Desktop.ini
 .ropeproject
 _build/
 *.sqlite3
+.idea/

From c78c3e674f561442f6996fd5a796c0b78cae0b73 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sun, 20 Aug 2017 13:33:25 +0200
Subject: [PATCH 2/4] Add Vagrantfile and salt bootstrap config

---
 .gitignore        |  1 +
 Vagrantfile       | 27 +++++++++++++++++++++++++++
 salt/bootstrap.sh | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 Vagrantfile
 create mode 100755 salt/bootstrap.sh

diff --git a/.gitignore b/.gitignore
index b2b9bd3..da9d74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ Desktop.ini
 _build/
 *.sqlite3
 .idea/
+.vagrant/
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 0000000..2dd61e2
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,27 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  config.vm.box = "debian/contrib-jessie64"
+
+  config.vm.hostname = "gvapgsql.local"
+  config.vm.network "private_network", ip: "172.16.3.7"
+
+  config.vm.synced_folder "../gvasalt/states/", "/srv/salt/"
+  config.vm.synced_folder "../gvasalt/pillar/", "/srv/pillar/"
+
+  config.vm.provider "virtualbox" do |vb|
+     # vb.gui = true
+     vb.memory = "512"
+  end
+
+  config.vm.provision :salt do |salt|
+      salt.bootstrap_script = "salt/bootstrap.sh"
+      salt.minion_id = "gvapgsql"
+      salt.masterless = true
+      salt.run_highstate = true
+      salt.verbose = true
+      salt.colorize = true
+      salt.log_level = "warning"
+  end
+end
\ No newline at end of file
diff --git a/salt/bootstrap.sh b/salt/bootstrap.sh
new file mode 100755
index 0000000..15df7f1
--- /dev/null
+++ b/salt/bootstrap.sh
@@ -0,0 +1,38 @@
+#!/bin/sh -
+
+echo "deb http://httpredir.debian.org/debian jessie-backports main" >/etc/apt/sources.list.d/backports.list
+
+apt-get update
+apt-get install -y -t jessie-backports python-cryptography
+
+# We just download the bootstrap script by default and execute that.
+if [ -x /usr/bin/fetch ]; then
+    /usr/bin/fetch -o - https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"
+elif [ -x /usr/bin/curl ]; then
+    /usr/bin/curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh | sh -s -- "$@"
+else
+    python \
+        -c 'import urllib; print urllib.urlopen("https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.sh").read()' \
+        | sh -s -- "$@"
+fi
+
+cat >/etc/salt/minion <<EOF
+file_client: local
+
+file_roots:
+  base:
+    - /srv/salt/
+
+pillar_roots:
+  base:
+    - /srv/pillar
+
+log_file: file:///dev/log
+EOF
+
+umask 077
+cat >/etc/salt/grains <<EOF
+roles:
+  - postgresql-server
+  - gnuviechadmin.gvapgsql
+EOF

From e40da03abbecb52455dd2b645c9a594e44a58cda Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Wed, 21 Nov 2018 14:06:38 +0100
Subject: [PATCH 3/4] Update kombu and amqp

---
 requirements/base.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements/base.txt b/requirements/base.txt
index 178da47..e50a622 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,8 +1,8 @@
-amqp==1.4.6
+amqp==1.4.9
 bpython==0.13.1
 anyjson==0.3.3
 billiard==3.3.0.19
 celery==3.1.17
-kombu==3.0.24
+kombu==3.0.37
 pytz==2014.10
 psycopg2==2.5.4

From 28d133491a22b1fe71736228d4b2f22561d94d78 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Wed, 21 Nov 2018 14:10:14 +0100
Subject: [PATCH 4/4] Bump version, update changelog

---
 docs/changelog.rst | 3 +++
 docs/conf.py       | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 89d5688..b0dfc19 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+* :release:`0.2.0 <2018-11-21>`
+* :feature:`-` fix compatibility with Python 2.7 on Debian Stretch
+
 * :release:`0.1.0 <2015-01-10>`
 * :feature:`-` provide functionality to create and delete PostgreSQL users and databases
 * :feature:`-` initial project setup
diff --git a/docs/conf.py b/docs/conf.py
index 887623f..2b24949 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,16 +53,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'gvapgsql'
-copyright = u'2015 Jan Dittberner'
+copyright = u'2015-2018 Jan Dittberner'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '0.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '0.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.