Skip to content

Commit

Permalink
Don't use dist_utils and manually specified requirements in st2client…
Browse files Browse the repository at this point in the history
… setup.py.

This is a temporary work around until we ensure that a more recent version of
virtualenv is installed everywhere where st2client is installed.
  • Loading branch information
Kami committed Jan 25, 2016
1 parent 217feda commit bee233f
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions st2client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,20 @@

from setuptools import setup, find_packages

from dist_utils import fetch_requirements
from dist_utils import apply_vagrant_workaround
# Note: We should re-enable usage of dist_utils once we ensure
# that we install new version of virtualenv which ships with
# pip >= 6.1 in all the environments
# from dist_utils import fetch_requirements
# from dist_utils import apply_vagrant_workaround
from st2client import __version__

ST2_COMPONENT = 'st2client'
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
REQUIREMENTS_FILE = os.path.join(BASE_DIR, 'requirements.txt')

install_reqs, dep_links = fetch_requirements(REQUIREMENTS_FILE)
# install_reqs, dep_links = fetch_requirements(REQUIREMENTS_FILE)
# apply_vagrant_workaround()

apply_vagrant_workaround()
setup(
name=ST2_COMPONENT,
version=__version__,
Expand All @@ -48,8 +51,15 @@
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7'
],
install_requires=install_reqs,
dependency_links=dep_links,
install_requires=[
'jsonpath-rw>=1.3.0',
'prettytable',
'python-dateutil',
'pyyaml<4.0,>=3.11',
'requests<3.0,>=2.7.0',
'six==1.9.0'
],
dependency_links=[],
test_suite=ST2_COMPONENT,
zip_safe=False,
include_package_data=True,
Expand Down

0 comments on commit bee233f

Please sign in to comment.