prepare 6.8.1 release

.circleci/config.yml

@@ -15,7 +15,7 @@ test-template: &test-template
     - run:
         name: install requirements
         command: |
-          sudo pip install --upgrade pip setuptools;
+          sudo pip install --upgrade pip virtualenv;
           sudo pip install -r test-requirements.txt;
           if [[ "$CIRCLE_JOB" != "test-3.3" ]] && [[ "$CIRCLE_JOB" != "test-3.4" ]]; then
             sudo pip install -r consul-requirements.txt;
@@ -32,6 +32,15 @@ test-template: &test-template
           else
             pytest -s --junitxml=test-reports/junit.xml testing;
           fi
+    - run:
+        name: test packaging/install
+        # Note, virtualenv isn't supported on Python 3.3 and this test requires virtualenv. But we
+        # never build our published package on 3.3 anyway.
+        command: |
+          if [[ "$CIRCLE_JOB" != "test-3.3" ]]; then
+            sudo rm -rf dist *.egg-info;
+            ./scripts/test-packaging.sh;
+          fi
     - store_test_results:
         path: test-reports
     - store_artifacts:

.gitignore

@@ -66,5 +66,4 @@ p2venv
 .idea
 *.iml
 .vagrant
-ldd/py2
-ldd/py3
+test-packaging-venv

MANIFEST.in

@@ -1,5 +1,7 @@
 include requirements.txt
 include README.txt
 include test-requirements.txt
+include consul-requirements.txt
+include dynamodb-requirements.txt
 include redis-requirements.txt
 include python2.6-requirements.txt

scripts/test-packaging.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+rm -rf dist
+python setup.py sdist
+
+rm -rf test-packaging
+mkdir test-packaging
+cd test-packaging
+virtualenv env
+source env/bin/activate
+
+pip install ../dist/*.tar.gz