X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1f0466a3493bd4a04d4164925c0255c28ad0f937..41a86f4d59ac63acb8c78d55b8c4a0d042941568:/sdk/pam/setup.py

diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index 208644ea6f..c94f5b41f5 100755
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -1,8 +1,13 @@
 #!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
 
+from __future__ import absolute_import
+import glob
 import os
 import sys
-import setuptools.command.egg_info as egg_info_cmd
+import re
 import subprocess
 
 from setuptools import setup, find_packages
@@ -10,15 +15,16 @@ 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, OSError):
-    pass
+import arvados_version
+version = arvados_version.get_version(SETUP_DIR, "arvados_pam")
+
+short_tests_only = False
+if '--short-tests-only' in sys.argv:
+    short_tests_only = True
+    sys.argv.remove('--short-tests-only')
 
 setup(name='arvados-pam',
-      version='0.1',
+      version=version,
       description='Arvados PAM module',
       long_description=open(README).read(),
       author='Arvados',
@@ -32,15 +38,22 @@ setup(name='arvados-pam',
       scripts=[
       ],
       data_files=[
-          ('/usr/share/pam-configs', ['pam-configs/arvados']),
-          ('/lib/security', ['lib/libpam_arvados.py']),
-          ('/usr/share/arvados-pam', ['examples/shellinabox']),
+          ('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'],
-      zip_safe=False,
-      cmdclass={'egg_info': tagger},
+      tests_require=['pbr<1.7.0', 'mock>=1.0', 'python-pam'],
+      zip_safe=False
       )