Merge branch 'release/0.2.0' into production

* release/0.2.0:
  Bump version, update changelog
  Update kombu and amqp
  Add Vagrantfile and salt bootstrap config
  Ignore PyCharm files

.gitignore

@@ -41,3 +41,5 @@ Desktop.ini
 .ropeproject
 _build/
 *.sqlite3
+.idea/
+.vagrant/

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

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

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.

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

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