projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9957-keep-web-config' closes #9957
[arvados.git]
/
sdk
/
pam
/
setup.py
diff --git
a/sdk/pam/setup.py
b/sdk/pam/setup.py
index f8a0c62393c5e29dbe5c04580697ad0100422eaa..c194013d49074e3652216b2070e1eaa59bd0e055 100755
(executable)
--- a/
sdk/pam/setup.py
+++ b/
sdk/pam/setup.py
@@
-1,5
+1,6
@@
#!/usr/bin/env python
#!/usr/bin/env python
+import glob
import os
import sys
import setuptools.command.egg_info as egg_info_cmd
import os
import sys
import setuptools.command.egg_info as egg_info_cmd
@@
-13,8
+14,7
@@
README = os.path.join(SETUP_DIR, 'README.rst')
tagger = egg_info_cmd.egg_info
try:
import gittaggers
tagger = egg_info_cmd.egg_info
try:
import gittaggers
- if subprocess.check_call(['git', 'log', '-n1']):
- tagger = gittaggers.EggInfoFromGit
+ tagger = gittaggers.EggInfoFromGit
except (ImportError, OSError):
pass
except (ImportError, OSError):
pass
@@
-32,11
+32,17
@@
setup(name='arvados-pam',
],
scripts=[
],
],
scripts=[
],
+ data_files=[
+ ('lib/security', ['lib/libpam_arvados.py']),
+ ('share/pam-configs', ['pam-configs/arvados']),
+ ('share/doc/arvados-pam', ['LICENSE-2.0.txt', 'README.rst']),
+ ('share/doc/arvados-pam/examples', glob.glob('examples/*')),
+ ],
install_requires=[
'arvados-python-client>=0.1.20150801000000',
],
test_suite='tests',
install_requires=[
'arvados-python-client>=0.1.20150801000000',
],
test_suite='tests',
- tests_require=['mock>=1.0', 'python-pam'],
+ tests_require=['
pbr<1.7.0', '
mock>=1.0', 'python-pam'],
zip_safe=False,
cmdclass={'egg_info': tagger},
)
zip_safe=False,
cmdclass={'egg_info': tagger},
)