Increment version, sort out some setuptools/ez_setup stuff, focus on …

…pip in install documentation

INSTALL.rst

@@ -9,15 +9,21 @@ Selenium2Library supports all Python and Jython interpreters supported by the
 Robot Framework and the `Selenium Python Bindings`_. The Selenium Python Bindings
 are the most restrictive, and as of now require Python 2.6 or Python 2.7.
 
-Selenium2Library depends on a few other Python libraries, but all of those
-will be installed automatically when Selenium2Library is installed.
+Selenium2Library depends on a handful of other Python libraries, including
+of course Robot Framework and Selenium. All dependencies are declared
+in setup.py. If you use pip or easy_install to install this library, these
+dependencies will be installed for you.
 
 
-Installing from PyPI
---------------------
+Installing from PyPI (recommended)
+----------------------------------
 
 Selenium2Library is available in the Python Package Index (PyPI_). To install,
-you need to have `easy_install`_ installed. Then run::
+you need to have `pip`_ installed. Then run::
+
+	pip install robotframework-selenium2library
+
+Or alternately, if you only have `easy_install`_,::
 
 	easy_install robotframework-selenium2library
 
@@ -27,11 +33,15 @@ Installing from source
 
 The source code can be retrieved either as a source distribution or as a clone
 of the main source repository. The installer requires Python version 2.4 or
-newer. Selenium Library is installed from source by typing following command::
+newer. Install by running::
 
     python setup.py install
 
-In most linux systems, you need to have root privileges for installation.
+Or, to automatically install all dependencies, run::
+
+    python setup.py develop
+
+Note: In most linux systems, you need to have root privileges for installation.
 
 Uninstallation is achieved by deleting the installation directory and its
 contents from the file system. The default installation directory is
@@ -50,4 +60,5 @@ Control Panel (Add/Remove Programs on older versions of Windows).
 
 .. _Selenium Python Bindings: http://code.google.com/p/selenium/wiki/PythonBindings
 .. _PyPI: http://code.google.com/p/selenium/wiki/PythonBindings
+.. _pip: http://www.pip-installer.org
 .. _easy_install: http://pypi.python.org/pypi/setuptools

MANIFEST.in

@@ -1,8 +1,8 @@
 include MANIFEST.in
 include *.txt
 include *.rst
-exclude */*.txt # limit previous command to include *.txt files in root folder
-exclude */*.rst # limit previous command to include *.rst files in root folder
+exclude */*.txt # limit previous command to include only *.txt files in root folder
+exclude */*.rst # limit previous command to include only *.rst files in root folder
 include selenium.bmp
 
 recursive-include demo *.txt *.rst *.py *.sh *.bat *.html *.css *.js
@@ -12,6 +12,6 @@ prune demo/output.xml
 
 include doc/Selenium2Library.html
 
-recursive-include src/Selenium2Library *.py
+recursive-include src *.py
 graft src/Selenium2Library/resources
 recursive-exclude src *.pyc

setup.py

@@ -1,17 +1,13 @@
 #!/usr/bin/env python
 
-try:
-    from ez_setup import use_setuptools
-    use_setuptools()
-except ImportError:
-    pass
+import sys
+from os.path import join, dirname
 
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+sys.path.append(join(dirname(__file__), 'src'))
+from ez_setup import use_setuptools
+use_setuptools()
+from setuptools import setup
 
-from os.path import join, dirname
 execfile(join(dirname(__file__), 'src', 'Selenium2Library', 'version.py'))
 
 DESCRIPTION = """

src/Selenium2Library/version.py

@@ -1 +1 @@
-VERSION = '1.0.0'
+VERSION = '1.0.1'