projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4717: use keep_services -> read_only flag in python sdk.
[arvados.git]
/
sdk
/
python
/
setup.py
diff --git
a/sdk/python/setup.py
b/sdk/python/setup.py
index ed27fac33502e93aa98deb170636ca4b3bdc5b01..571faf169dd054eb5b131bcc8dc6ada2af763ae9 100644
(file)
--- a/
sdk/python/setup.py
+++ b/
sdk/python/setup.py
@@
-2,23
+2,18
@@
import os
import sys
import os
import sys
+import setuptools.command.egg_info as egg_info_cmd
from setuptools import setup, find_packages
from setuptools import setup, find_packages
-from setuptools.command.egg_info import egg_info
SETUP_DIR = os.path.dirname(__file__) or '.'
README = os.path.join(SETUP_DIR, 'README.rst')
SETUP_DIR = os.path.dirname(__file__) or '.'
README = os.path.join(SETUP_DIR, 'README.rst')
-
if '--sha1-tag' in sys.argv
:
+
try
:
import gittaggers
import gittaggers
- tagger = gittaggers.TagBuildWithCommitDateAndSha1
- sys.argv.remove('--sha1-tag')
-else:
- try:
- import gittaggers
- tagger = gittaggers.TagBuildWithCommitDate
- except ImportError:
- tagger = egg_info
+ tagger = gittaggers.EggInfoFromGit
+except ImportError:
+ tagger = egg_info_cmd.egg_info
setup(name='arvados-python-client',
version='0.1',
setup(name='arvados-python-client',
version='0.1',
@@
-31,23
+26,24
@@
setup(name='arvados-python-client',
license='Apache 2.0',
packages=find_packages(),
scripts=[
license='Apache 2.0',
packages=find_packages(),
scripts=[
- 'bin/arv-copy',
- 'bin/arv-get',
- 'bin/arv-keepdocker',
- 'bin/arv-ls',
- 'bin/arv-normalize',
- 'bin/arv-put',
- 'bin/arv-run',
- 'bin/arv-ws'
-
],
+
'bin/arv-copy',
+
'bin/arv-get',
+
'bin/arv-keepdocker',
+
'bin/arv-ls',
+
'bin/arv-normalize',
+
'bin/arv-put',
+
'bin/arv-run',
+
'bin/arv-ws'
+ ],
install_requires=[
install_requires=[
- 'python-gflags',
- 'google-api-python-client',
- 'httplib2',
- 'requests>=2.4',
- 'urllib3',
- 'ws4py'
- ],
+ 'google-api-python-client',
+ 'httplib2',
+ 'pycurl>=7.19',
+ 'python-gflags',
+ 'requests>=2.4',
+ 'urllib3',
+ 'ws4py'
+ ],
test_suite='tests',
tests_require=['mock>=1.0', 'PyYAML'],
zip_safe=False,
test_suite='tests',
tests_require=['mock>=1.0', 'PyYAML'],
zip_safe=False,