projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15781-multi-value-property-search'
[arvados.git]
/
sdk
/
pam
/
setup.py
diff --git
a/sdk/pam/setup.py
b/sdk/pam/setup.py
index 9bc2cef60169b674a51d6ae3cffc24662aaa78df..59b49a19fe4876562175c09adc6939c52bdb86b5 100755
(executable)
--- a/
sdk/pam/setup.py
+++ b/
sdk/pam/setup.py
@@
-17,6
+17,11
@@
README = os.path.join(SETUP_DIR, 'README.rst')
import arvados_version
version = arvados_version.get_version(SETUP_DIR, "arvados_pam")
import arvados_version
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:
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',
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',
license='Apache 2.0',
packages=[
'arvados_pam',
@@
-44,9
+49,9
@@
setup(name='arvados-pam',
('share/doc/arvados-pam/examples', glob.glob('examples/*')),
],
install_requires=[
('share/doc/arvados-pam/examples', glob.glob('examples/*')),
],
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'],
],
test_suite='tests',
tests_require=['pbr<1.7.0', 'mock>=1.0', 'python-pam'],
- zip_safe=False
-
)
+ zip_safe=False
,
+)