Merge branch 'master' of github.com:rohe/pysaml2

2015-05-15 20:26:57 +02:00
parent b42195f3f6 b44ca80707
commit f07c541c37
2 changed files with 4 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.~
 \#*
 .*~
+.eggs
+*.egg
 *.egg-info
 example/*/*.log
 example/*.db
@@ -192,3 +194,4 @@ example/sp-repoze/sp_conf_2.Pygmalion
 example/sp-repoze/sp_conf_2.py

 sp.xml
+tests/pki/qwerty.*
--- 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',