Merge pull request #225 from seleniumbase/refactor-requirements

Refactor requirements

Author: mdmintz

README.md

@@ -6,14 +6,14 @@ A complete framework for web automation, end-to-end testing, and [user-onboardin
 
 ## <img src="https://cdn2.hubspot.net/hubfs/100006/images/sb_logo_box2.png" title="SeleniumBase" height="32"> Quick Start
 
-(<i>Requires [Git](https://git-scm.com/) and [Python](https://www.python.org/downloads/). Optionally a [Python virtual environment](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/virtualenv_instructions.md).</i>)
+(<i>Requires [Git](https://git-scm.com/) and [Python](https://www.python.org/downloads/). Optionally, you may want to use a [Python virtual environment](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/virtualenv_instructions.md) to isolate Python dependencies between projects.</i>)
 
 Clone SeleniumBase from GitHub:
 ```
 git clone https://github.com/seleniumbase/SeleniumBase.git
 ```
 
-Upgrade [pip](https://pypi.org/project/pip/) and [setuptools](https://pypi.org/project/setuptools/) if you don't have the latest versions:
+Upgrade [pip](https://pypi.org/project/pip/) and [setuptools](https://pypi.org/project/setuptools/) if you don't have the latest versions: (You may need to add ``--user`` to the command if you're not inside a [Python virtual environment](https://github.com/seleniumbase/SeleniumBase/blob/master/help_docs/virtualenv_instructions.md).)
 ```
 python -m pip install -U pip setuptools
 ```

requirements.txt

@@ -1,22 +1,22 @@
 pip
-ipython
 setuptools
+ipython
+six
+nose
+ipdb
+chardet
+unittest2
 selenium==3.14.1
+requests>=2.20.0
 pytest>=3.9.1
 pytest-cov>=2.6.0
 pytest-html>=1.19.0
 pytest-rerunfailures>=4.2
 pytest-xdist>=1.23.2
 parameterized==0.6.1
 beautifulsoup4>=4.6.0
-six>=1.11.0
 pyotp>=2.2.6
-requests>=2.19.1
-unittest2>=1.1.0
-chardet>=3.0.4
 boto>=2.49.0
-nose==1.3.7
-ipdb==0.11
 flake8==3.5.0
 PyVirtualDisplay==0.2.1
 -e .

setup.py

@@ -17,7 +17,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.16.8',
+    version='1.16.9',
     description='All-In-One Test Automation Framework',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -51,24 +51,24 @@
     ],
     install_requires=[
         'pip',
-        'ipython',
         'setuptools',
+        'ipython',
+        'six',
+        'nose',
+        'ipdb',
+        'chardet',
+        'unittest2',
         'selenium==3.14.1',
+        'requests>=2.20.0',
         'pytest>=3.9.1',
         'pytest-cov>=2.6.0',
         'pytest-html>=1.19.0',
         'pytest-rerunfailures>=4.2',
         'pytest-xdist>=1.23.2',
         'parameterized==0.6.1',
         'beautifulsoup4>=4.6.0',  # Keep at >=4.6.0 while using bs4
-        'six>=1.11.0',
         'pyotp>=2.2.6',
-        'requests>=2.19.1',
-        'unittest2>=1.1.0',
-        'chardet>=3.0.4',
         'boto>=2.49.0',
-        'nose==1.3.7',  # Keep at ==1.3.7
-        'ipdb==0.11',
         'flake8==3.5.0',
         'PyVirtualDisplay==0.2.1',
     ],