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

This commit is contained in:
Roland Hedberg
2015-05-15 20:26:57 +02:00
2 changed files with 4 additions and 1 deletions

3
.gitignore vendored
View File

@@ -2,6 +2,8 @@
*.~ *.~
\#* \#*
.*~ .*~
.eggs
*.egg
*.egg-info *.egg-info
example/*/*.log example/*/*.log
example/*.db example/*.db
@@ -192,3 +194,4 @@ example/sp-repoze/sp_conf_2.Pygmalion
example/sp-repoze/sp_conf_2.py example/sp-repoze/sp_conf_2.py
sp.xml sp.xml
tests/pki/qwerty.*

View File

@@ -38,7 +38,7 @@ tests_require = [
'mongodict', 'mongodict',
'pyasn1', 'pyasn1',
'pymongo==3.0.1', 'pymongo==3.0.1',
'python-memcached == 1.51', 'python-memcached >= 1.51',
'pytest', 'pytest',
'mako', 'mako',
#'pytest-coverage', #'pytest-coverage',