7491: Manual merge with 7491-keepclient-bugs

[arvados.git] / sdk / pam / setup.py

diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
old mode 100644 (file)
new mode 100755 (executable)
index ed47388..d261ceb
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -3,17 +3,19 @@
 import os
 import sys
 import setuptools.command.egg_info as egg_info_cmd
+import subprocess
 
 from setuptools import setup, find_packages
 
 SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
 
+tagger = egg_info_cmd.egg_info
 try:
     import gittaggers
     tagger = gittaggers.EggInfoFromGit
-except ImportError:
-    tagger = egg_info_cmd.egg_info
+except (ImportError, OSError):
+    pass
 
 setup(name='arvados-pam',
       version='0.1',
@@ -29,11 +31,16 @@ setup(name='arvados-pam',
       ],
       scripts=[
       ],
+      data_files=[
+          ('lib/security', ['lib/libpam_arvados.py']),
+          ('share/arvados-pam', ['examples/shellinabox']),
+          ('share/pam-configs', ['pam-configs/arvados']),
+      ],
       install_requires=[
           'arvados-python-client>=0.1.20150801000000',
       ],
       test_suite='tests',
-      tests_require=['mock>=1.0', 'PyYAML'],
+      tests_require=['pbr<1.7.0', 'mock>=1.0', 'python-pam'],
       zip_safe=False,
       cmdclass={'egg_info': tagger},
       )