Merge pull request #782 from selurvedu/buildout-2

Fix the build process; remove chromedriver package dependency
(master branch)

@@ -29,6 +29,12 @@ __version__ = '2015-07-01'
 # See zc.buildout's changelog if this version is up to date.
 # See zc.buildout's changelog if this version is up to date.
 
 
 tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
 tmpeggs = tempfile.mkdtemp(prefix='bootstrap-')
+eggsdir = os.path.join(os.path.dirname(__file__), 'eggs')
+try:
+    os.mkdir(eggsdir)
+except OSError as e:
+    if e.errno != 17:
+        raise
 
 
 usage = '''\
 usage = '''\
 [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
 [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
@@ -64,10 +70,13 @@ parser.add_option("--allow-site-packages",
                   action="store_true", default=False,
                   action="store_true", default=False,
                   help=("Let bootstrap.py use existing site packages"))
                   help=("Let bootstrap.py use existing site packages"))
 parser.add_option("--buildout-version",
 parser.add_option("--buildout-version",
+                  default='2.5.3',
                   help="Use a specific zc.buildout version")
                   help="Use a specific zc.buildout version")
 parser.add_option("--setuptools-version",
 parser.add_option("--setuptools-version",
+                  default='33.1.1',
                   help="Use a specific setuptools version")
                   help="Use a specific setuptools version")
 parser.add_option("--setuptools-to-dir",
 parser.add_option("--setuptools-to-dir",
+                  default=eggsdir,
                   help=("Allow for re-use of existing directory of "
                   help=("Allow for re-use of existing directory of "
                         "setuptools versions"))
                         "setuptools versions"))
 
 

@@ -98,6 +98,6 @@ robotframework = 3.0.0
 robotframework-debuglibrary = 0.8
 robotframework-debuglibrary = 0.8
 robotframework-lint = 0.7
 robotframework-lint = 0.7
 robotframework-selenium2library = 1.8.0
 robotframework-selenium2library = 1.8.0
-setuptools = 18.3.2
+setuptools = 33.1.1
 zc.buildout = 2.5.3
 zc.buildout = 2.5.3
 zc.recipe.egg = 2.0.3
 zc.recipe.egg = 2.0.3

@@ -6,6 +6,8 @@ Setuptools bootstrapping installer.
 Maintained at https://github.com/pypa/setuptools/tree/bootstrap.
 Maintained at https://github.com/pypa/setuptools/tree/bootstrap.
 
 
 Run this script to install or upgrade setuptools.
 Run this script to install or upgrade setuptools.
+
+This method is DEPRECATED. Check https://github.com/pypa/setuptools/issues/581 for more details.
 """
 """
 
 
 import os
 import os
@@ -18,25 +20,22 @@ import subprocess
 import platform
 import platform
 import textwrap
 import textwrap
 import contextlib
 import contextlib
-import json
-import codecs
+import warnings
 
 
 from distutils import log
 from distutils import log
 
 
 try:
 try:
     from urllib.request import urlopen
     from urllib.request import urlopen
-    from urllib.parse import urljoin
 except ImportError:
 except ImportError:
     from urllib2 import urlopen
     from urllib2 import urlopen
-    from urlparse import urljoin
 
 
 try:
 try:
     from site import USER_SITE
     from site import USER_SITE
 except ImportError:
 except ImportError:
     USER_SITE = None
     USER_SITE = None
 
 
-LATEST = object()
-DEFAULT_VERSION = "18.3.2"
+# 33.1.1 is the last version that supports setuptools self upgrade/installation.
+DEFAULT_VERSION = "33.1.1"
 DEFAULT_URL = "https://pypi.io/packages/source/s/setuptools/"
 DEFAULT_URL = "https://pypi.io/packages/source/s/setuptools/"
 DEFAULT_SAVE_DIR = os.curdir
 DEFAULT_SAVE_DIR = os.curdir
 
 
@@ -157,7 +156,6 @@ def use_setuptools(
     Return None. Raise SystemExit if the requested version
     Return None. Raise SystemExit if the requested version
     or later cannot be installed.
     or later cannot be installed.
     """
     """
-    version = _resolve_version(version)
     to_dir = os.path.abspath(to_dir)
     to_dir = os.path.abspath(to_dir)
 
 
     # prior to importing, capture the module state for
     # prior to importing, capture the module state for
@@ -344,7 +342,6 @@ def download_setuptools(
     ``downloader_factory`` should be a function taking no arguments and
     ``downloader_factory`` should be a function taking no arguments and
     returning a function for downloading a URL to a target.
     returning a function for downloading a URL to a target.
     """
     """
-    version = _resolve_version(version)
     # making sure we use the absolute path
     # making sure we use the absolute path
     to_dir = os.path.abspath(to_dir)
     to_dir = os.path.abspath(to_dir)
     zip_name = "setuptools-%s.zip" % version
     zip_name = "setuptools-%s.zip" % version
@@ -357,27 +354,6 @@ def download_setuptools(
     return os.path.realpath(saveto)
     return os.path.realpath(saveto)
 
 
 
 
-def _resolve_version(version):
-    """
-    Resolve LATEST version
-    """
-    if version is not LATEST:
-        return version
-
-    meta_url = urljoin(DEFAULT_URL, '/pypi/setuptools/json')
-    resp = urlopen(meta_url)
-    with contextlib.closing(resp):
-        try:
-            charset = resp.info().get_content_charset()
-        except Exception:
-            # Python 2 compat; assume UTF-8
-            charset = 'UTF-8'
-        reader = codecs.getreader(charset)
-        doc = json.load(reader(resp))
-
-    return str(doc['info']['version'])
-
-
 def _build_install_args(options):
 def _build_install_args(options):
     """
     """
     Build the arguments to 'python setup.py install' on the setuptools package.
     Build the arguments to 'python setup.py install' on the setuptools package.
@@ -433,4 +409,5 @@ def main():
     return _install(archive, _build_install_args(options))
     return _install(archive, _build_install_args(options))
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
+    warnings.warn("ez_setup.py is deprecated, check https://github.com/pypa/setuptools/issues/581 for more info; use pip to install setuptools")
     sys.exit(main())
     sys.exit(main())

-from chromedriver import CHROMEDRV_PATH
-from robot import run_cli
 import os
 import os
 import sys
 import sys
-
-sys.path.append(CHROMEDRV_PATH)
+from robot import run_cli
 
 
 
 
 def runner():
 def runner():

@@ -22,7 +22,6 @@ setup(name='op_robot_tests',
           'Pillow',
           'Pillow',
           'PyYAML',
           'PyYAML',
           'barbecue',
           'barbecue',
-          'chromedriver',
           'dateutils',
           'dateutils',
           'dpath',
           'dpath',
           'haversine',
           'haversine',