packages: Stop hardcoding version in dependency checks.

In zulip_bots/setup.py, we now don't specify a minimum version when
checking for dependency on the zulip package. We just want the
latest one.

In zulip_botserver/setup.py, we now don't specify a minimum version
when checking for dependencies on the zulip and zulip_bots package.
We just want the latest ones.
This commit is contained in:
Eeshan Garg 2017-09-20 20:32:43 -02:30 committed by Tim Abbott
parent 07edd4aa9b
commit aaece51380
2 changed files with 15 additions and 8 deletions

View file

@ -3,14 +3,18 @@
from __future__ import print_function from __future__ import print_function
import os
import sys import sys
import generate_manifest import generate_manifest
ZULIP_BOTS_VERSION = "0.3.4"
# We should be installable with either setuptools or distutils. # We should be installable with either setuptools or distutils.
package_info = dict( package_info = dict(
name='zulip_bots', name='zulip_bots',
version='0.3.4', version=ZULIP_BOTS_VERSION,
description='Zulip\'s Bot framework', description='Zulip\'s Bot framework',
author='Zulip Open Source Project', author='Zulip Open Source Project',
author_email='zulip-devel@googlegroups.com', author_email='zulip-devel@googlegroups.com',
@ -36,7 +40,7 @@ package_info = dict(
setuptools_info = dict( setuptools_info = dict(
install_requires=[ install_requires=[
'zulip>=0.3.4', 'zulip',
'mock>=2.0.0', 'mock>=2.0.0',
'html2text', # for bots/define 'html2text', # for bots/define
], ],
@ -66,7 +70,7 @@ except ImportError:
print("{name} is not installed.".format(name=module_name), file=sys.stderr) print("{name} is not installed.".format(name=module_name), file=sys.stderr)
sys.exit(1) sys.exit(1)
check_dependency_manually('zulip', '0.3.4') check_dependency_manually('zulip')
check_dependency_manually('mock', '2.0.0') check_dependency_manually('mock', '2.0.0')
check_dependency_manually('html2text') check_dependency_manually('html2text')
check_dependency_manually('PyDictionary') check_dependency_manually('PyDictionary')

View file

@ -3,12 +3,15 @@
from __future__ import print_function from __future__ import print_function
import os
import sys import sys
ZULIP_BOTSERVER_VERSION = "0.3.4"
# We should be installable with either setuptools or distutils. # We should be installable with either setuptools or distutils.
package_info = dict( package_info = dict(
name='zulip_botserver', name='zulip_botserver',
version='0.3.4', version=ZULIP_BOTSERVER_VERSION,
description='Zulip\'s Flask server for running bots', description='Zulip\'s Flask server for running bots',
author='Zulip Open Source Project', author='Zulip Open Source Project',
author_email='zulip-devel@googlegroups.com', author_email='zulip-devel@googlegroups.com',
@ -30,8 +33,8 @@ package_info = dict(
setuptools_info = dict( setuptools_info = dict(
install_requires=[ install_requires=[
'zulip>=0.3.4', 'zulip',
'zulip_bots>=0.3.4', 'zulip_bots',
'flask>=0.12.2', 'flask>=0.12.2',
], ],
) )
@ -60,8 +63,8 @@ except ImportError:
print("{name} is not installed.".format(name=module_name), file=sys.stderr) print("{name} is not installed.".format(name=module_name), file=sys.stderr)
sys.exit(1) sys.exit(1)
check_dependency_manually('zulip', '0.3.4') check_dependency_manually('zulip')
check_dependency_manually('zulip_bots', '0.3.4') check_dependency_manually('zulip_bots')
check_dependency_manually('flask', '0.12.2') check_dependency_manually('flask', '0.12.2')
package_info['packages'] = ['zulip_botserver'] package_info['packages'] = ['zulip_botserver']