From aad2eb0b9b92d36d1fbeea8087951afc863cc5ea Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Thu, 14 May 2015 16:12:44 -0700 Subject: [PATCH 1/3] Allow newer versions of python-memcached in tests Version 1.51 is older, and newer versions have fixes for python3. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 22cbeaf..b9e5c61 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ tests_require = [ 'mongodict', 'pyasn1', 'pymongo==3.0.1', - 'python-memcached == 1.51', + 'python-memcached >= 1.51', 'pytest', 'mako', #'pytest-coverage', From aabb01583bc7c790f3350d86335160db781d1194 Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Thu, 14 May 2015 16:14:10 -0700 Subject: [PATCH 2/3] add .egg and similar to .gitignore Running tests leaves these behind. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index fe1282a..193e387 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ *.~ \#* .*~ +.eggs +*.egg *.egg-info example/*/*.log example/*.db From 933d44dbb84f6257bd959549cd3f8a62a3f1a8f4 Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Fri, 15 May 2015 09:33:42 -0700 Subject: [PATCH 3/3] Add test result files from tests/pki to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 193e387..dad9802 100644 --- a/.gitignore +++ b/.gitignore @@ -194,3 +194,4 @@ example/sp-repoze/sp_conf_2.Pygmalion example/sp-repoze/sp_conf_2.py sp.xml +tests/pki/qwerty.*