16039: Touch python clients so they run tests with the latest SDK.

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

diff --git a/sdk/pam/setup.py b/sdk/pam/setup.py
index 23f23310ca025d2b665480b707fe1c5cd03def2e..59b49a19fe4876562175c09adc6939c52bdb86b5 100755 (executable)
--- a/sdk/pam/setup.py
+++ b/sdk/pam/setup.py
@@ -16,7 +16,12 @@ SETUP_DIR = os.path.dirname(__file__) or '.'
 README = os.path.join(SETUP_DIR, 'README.rst')
 
 import arvados_version
-version = arvados_version.get_version(SETUP_DIR, "arvados")
+version = arvados_version.get_version(SETUP_DIR, "arvados_pam")
+if os.environ.get('ARVADOS_BUILDING_VERSION', False):
+    pysdk_dep = "=={}".format(version)
+else:
+    # On dev releases, arvados-python-client may have a different timestamp
+    pysdk_dep = "<={}".format(version)
 
 short_tests_only = False
 if '--short-tests-only' in sys.argv:
@@ -30,7 +35,7 @@ setup(name='arvados-pam',
       author='Arvados',
       author_email='info@arvados.org',
       url='https://arvados.org',
-      download_url='https://github.com/curoverse/arvados.git',
+      download_url='https://github.com/arvados/arvados.git',
       license='Apache 2.0',
       packages=[
           'arvados_pam',
@@ -42,18 +47,11 @@ setup(name='arvados-pam',
           ('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',
+          'arvados-python-client{}'.format(pysdk_dep),
       ],
       test_suite='tests',
       tests_require=['pbr<1.7.0', 'mock>=1.0', 'python-pam'],
-      zip_safe=False
-      )
+      zip_safe=False,
+)