From 5af262daa399842c8b03d8a287f8ee32174b0cc3 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 15 Sep 2015 12:28:09 +0200
Subject: [PATCH] fix flakes problem, configure devpi upload to always upload
 wheels and sdist

---
 _pytest/runner.py | 1 -
 setup.cfg         | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/_pytest/runner.py b/_pytest/runner.py
index 5cee8509f..32be7dbed 100644
--- a/_pytest/runner.py
+++ b/_pytest/runner.py
@@ -1,7 +1,6 @@
 """ basic collect and runtest protocol implementations """
 import bdb
 import sys
-import re
 from time import time
 
 import py
diff --git a/setup.cfg b/setup.cfg
index 770dd1fb2..e9aecb776 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,3 +8,7 @@ upload-dir = doc/en/build/html
 
 [bdist_wheel]
 universal = 1
+
+[devpi:upload]
+formats=sdist.tgz,bdist_wheel
+