From 2aea0303eb64c6c82ee12c89e8a698275b36cb9f Mon Sep 17 00:00:00 2001
From: Michael Mintz <mdmintz@gmail.com>
Date: Thu, 25 Feb 2016 06:24:35 -0500
Subject: [PATCH] Simplify docker integration

---
 Dockerfile                                  |  5 +--
 integrations/docker/docker_requirements.txt | 13 --------
 integrations/docker/docker_setup.py         | 34 ---------------------
 3 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100755 integrations/docker/docker_requirements.txt
 delete mode 100755 integrations/docker/docker_setup.py

diff --git a/Dockerfile b/Dockerfile
index 293e04d6..f53a982f 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -94,12 +94,9 @@ RUN exec "$@"
 #=====================
 # Set up SeleniumBase
 #=====================
-COPY integrations/docker/docker_requirements.txt /SeleniumBase/
-COPY integrations/docker/docker_setup.py /SeleniumBase/
 COPY seleniumbase /SeleniumBase/seleniumbase/
 COPY examples /SeleniumBase/examples/
-RUN cd /SeleniumBase && ls && sudo pip install -r docker_requirements.txt
-RUN cd /SeleniumBase && ls && sudo python docker_setup.py install
+RUN cd /SeleniumBase && ls && pip install seleniumbase
 
 #==========================================
 # Create entrypoint and grab example tests
diff --git a/integrations/docker/docker_requirements.txt b/integrations/docker/docker_requirements.txt
deleted file mode 100755
index d13b398f..00000000
--- a/integrations/docker/docker_requirements.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-selenium==2.52.0
-nose==1.3.7
-pytest==2.8.7
-flake8==2.5.4
-requests==2.9.1
-urllib3==1.14
-BeautifulSoup==3.2.1
-unittest2==1.1.0
-chardet==2.3.0
-simplejson==3.8.2
-boto==2.39.0
-ipdb==0.8.1
-pyvirtualdisplay==0.1.5
diff --git a/integrations/docker/docker_setup.py b/integrations/docker/docker_setup.py
deleted file mode 100755
index 408eea9e..00000000
--- a/integrations/docker/docker_setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-The setup package to install the SeleniumBase Test Framework plugins
-(Docker edition)
-"""
-
-from setuptools import setup, find_packages  # noqa
-
-setup(
-    name='seleniumbase',
-    version='1.1.34',
-    author='Michael Mintz',
-    author_email='@mintzworld',
-    maintainer='Michael Mintz',
-    description='Reliable Browser Automation - http://seleniumbase.com',
-    license='The MIT License',
-    packages=['seleniumbase',
-                'seleniumbase.core',
-                'seleniumbase.plugins',
-                'seleniumbase.fixtures',
-                'seleniumbase.common',
-                'seleniumbase.config'],
-    entry_points={
-        'nose.plugins': [
-            'base_plugin = seleniumbase.plugins.base_plugin:Base',
-            'selenium = seleniumbase.plugins.selenium_plugin:SeleniumBrowser',
-            'page_source = seleniumbase.plugins.page_source:PageSource',
-            'screen_shots = seleniumbase.plugins.screen_shots:ScreenShots',
-            'test_info = seleniumbase.plugins.basic_test_info:BasicTestInfo',
-            's3_logging = seleniumbase.plugins.s3_logging_plugin:S3Logging',
-            ('hipchat_reporting = seleniumbase.plugins'
-             '.hipchat_reporting_plugin:HipchatReporting'),
-            ]
-        }
-    )