From 6cbe9cee9dc50b0b0c1ce84576126c3db4b71671 Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Mon, 23 Jul 2018 18:32:54 +0300
Subject: [PATCH 1/4] Start new development cycle

---
 CHANGELOG.md           | 2 ++
 federation/__init__.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2a5bed..773c796 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [0.17.0-dev] - unreleased
+
 ## [0.16.0] - 2018-07-23
 
 ### Added
diff --git a/federation/__init__.py b/federation/__init__.py
index 5a313cc..328b93a 100644
--- a/federation/__init__.py
+++ b/federation/__init__.py
@@ -1 +1 @@
-__version__ = "0.16.0"
+__version__ = "0.17.0-dev"

From 454dc8ccbc98c7e1056d5970338eb9e35ede968a Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Mon, 23 Jul 2018 18:33:47 +0300
Subject: [PATCH 2/4] Drop compatibility for Python <= 3.5

---
 CHANGELOG.md | 4 ++++
 setup.py     | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 773c796..4f2d871 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [0.17.0-dev] - unreleased
 
+### Changed
+
+* **Backwards incompatible.** Lowest compatible Python version is now 3.6.
+
 ## [0.16.0] - 2018-07-23
 
 ### Added
diff --git a/setup.py b/setup.py
index fe15c91..268e871 100644
--- a/setup.py
+++ b/setup.py
@@ -45,8 +45,6 @@ setup(
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Topic :: Communications',

From bb3281d4894d63c12e0101c48657b3763d92eb6a Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Mon, 23 Jul 2018 19:03:49 +0300
Subject: [PATCH 3/4] Add tox and gitlab CI

---
 .coveragerc          |  1 +
 .gitlab-ci.yml       | 30 ++++++++++++++++++++++++++++++
 dev-requirements.txt |  1 +
 tox.ini              | 17 +++++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 tox.ini

diff --git a/.coveragerc b/.coveragerc
index e5c28b1..1e1f315 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -3,3 +3,4 @@ omit =
     setup.py
     federation/__init__.py
     */tests/*
+    .tox/*
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..52a196a
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,30 @@
+# This file is a template, and might need editing before it works on your project.
+# Official language image. Look for the different tagged releases at:
+# https://hub.docker.com/r/library/python/tags/
+image: python:3.6
+
+# Change pip's cache directory to be inside the project directory since we can
+# only cache local items.
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache"
+
+# Pip's cache doesn't store the python packages
+# https://pip.pypa.io/en/stable/reference/pip_install/#caching
+#
+# If you want to also cache the installed packages, you have to install
+# them in a virtualenv and cache it as well.
+cache:
+  paths:
+    - .cache/pip
+    - venv/
+
+before_script:
+  - python -V
+  - pip install virtualenv
+  - virtualenv venv
+  - source venv/bin/activate
+
+test:
+  script:
+  - pip install tox
+  - tox
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 97be938..a6a93a4 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -10,6 +10,7 @@ codecov
 coverage
 pytest-cov
 pytest-warnings
+tox
 
 # Docs
 sphinx
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..6d90715
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,17 @@
+# tox (https://tox.readthedocs.io/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py36
+
+[testenv]
+usedevelop = True
+
+deps = -rdev-requirements.txt
+
+commands =
+    pip freeze
+    pytest --cov=./
+    #codecov

From a2e08d42f5a61140ec810bd221f56476ab15b7b2 Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Mon, 23 Jul 2018 19:21:58 +0300
Subject: [PATCH 4/4] One more place to bump Python version in docs

---
 docs/development.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/development.rst b/docs/development.rst
index e064d87..08f84a2 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -10,7 +10,7 @@ Help is more than welcome to extend this library. Please see the following resou
 Environment setup
 -----------------
 
-Once you have your (Python 3.3+) virtualenv set up, install the development requirements::
+Once you have your (Python 3.6+) virtualenv set up, install the development requirements::
 
    pip install -r dev-requirements.txt