9701: Fixed a previous test to match new flush() behaviour. Added a new one to check

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

diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index f8a0c62393c5e29dbe5c04580697ad0100422eaa..e1046ac9c75c8f3368cde784fac38bfa3feab7bf 100755 (executable)
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import glob
 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
-    if subprocess.check_call(['git', 'log', '-n1']):
-        tagger = gittaggers.EggInfoFromGit
+    tagger = gittaggers.EggInfoFromGit
 except (ImportError, OSError):
     pass
 
@@ -32,11 +32,24 @@ setup(name='arvados-pam',
       ],
       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/*')),
+
+          # The arvados build scripts used to install data files to
+          # "/usr/data/*" but now install them to "/usr/*". Here, we
+          # install an extra copy in the old location so existing pam
+          # configs can still work. When old systems have had a chance
+          # to update to the new paths, this line can be removed.
+          ('data/lib/security', ['lib/libpam_arvados.py']),
+      ],
       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},
       )