Merge the Python 2 & 3 requirements files, and break out test requirements into a separate file.

Make.bat

@@ -199,10 +199,6 @@ GOTO:EOF
 
     IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" GOTO err_handle_pythonvirtualenv
 
-    SET REQUIRMENTTXT=""
-    IF "%PYTHON_MAJOR%"=="2" SET REQUIRMENTTXT=requirements_py2.txt
-    IF "%PYTHON_MAJOR%"=="3" SET REQUIRMENTTXT=requirements_py3.txt
-    IF %REQUIRMENTTXT% == ""           GOTO err_handle_pythonversion
     SET PATH=%PGDIR%;%PGDIR%\bin;%PATH%
 goto:EXIT
 
@@ -220,7 +216,7 @@ goto:EXIT
     SET PATH=%PGDIR%\bin;%PATH%
 
     ECHO Installing dependencies...
-    pip install -r "%WD%\%REQUIRMENTTXT%"
+    pip install -r "%WD%\requirements.txt"
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
     pip install sphinx
     IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%

README

@@ -100,9 +100,12 @@ process is fairly simple - adapt as required for your distribution:
    pg_config can be found for building psycopg2), and install the required
    packages:
 
-    (pgadmin4) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements_py2.txt
+    (pgadmin4) $ PATH=$PATH:/usr/local/pgsql/bin pip install -r $PGADMIN4_SRC/requirements.txt
 
-   If you are using Python 3, use the requirements_py3.txt file instead.
+   If you are planning to run the regression tests, you also need to install
+   additional requirements from web/regression/requirements.txt:
+
+   (pgadmin4) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
 
 5) Create a local configuration file for pgAdmin. Edit
    $PGADMIN4_SRC/web/config_local.py and add any desired configuration options

pkg/mac/build.sh

@@ -40,11 +40,9 @@ fi
 if [ "$PYTHON_VERSION" -ge "30" ]; then
     export PYTHON=$PYTHON_HOME/bin/python3
     export PIP=pip3
-    export REQUIREMENTS=requirements_py3.txt
 else
     export PYTHON=$PYTHON_HOME/bin/python2
     export PIP=pip
-    export REQUIREMENTS=requirements_py2.txt
 fi
 
 if [ "x$QTDIR" == "x" ]; then
@@ -89,7 +87,7 @@ _create_python_virtualenv() {
     cd $BUILDROOT
     test -d $VIRTUALENV || virtualenv -p $PYTHON $VIRTUALENV || exit 1
     source $VIRTUALENV/bin/activate
-    $PIP install -r $SOURCEDIR/$REQUIREMENTS || { echo PIP install failed. Please resolve the issue and rerun the script; exit 1; }
+    $PIP install -r $SOURCEDIR/requirements.txt || { echo PIP install failed. Please resolve the issue and rerun the script; exit 1; }
 
     # Figure out some paths for use when completing the venv
     # Use "python" here as we want the venv path
@@ -235,4 +233,4 @@ _complete_bundle
 _framework_config
 _codesign_bundle
 _create_dmg
-_codesign_dmg
+_codesign_dmg

requirements.txt

@@ -15,10 +15,12 @@ Flask-Security==1.7.5
 Flask-SQLAlchemy==2.1
 Flask-WTF==0.12
 html5lib==1.0b3
+importlib==1.0.3; python_version <= '2.7'
 itsdangerous==0.24
 Jinja2==2.7.3
 linecache2==1.0.0
 MarkupSafe==0.23
+ordereddict; python_version < '2.7'
 passlib==1.6.2
 pbr==1.9.1
 psycopg2==2.6.2
@@ -27,15 +29,11 @@ pyrsistent==0.11.13
 python-dateutil==2.5.0
 python-mimeparse==1.5.1
 pytz==2014.10
-selenium==3.0.2
 simplejson==3.6.5
 six>=1.9.0
 speaklater==1.3
 SQLAlchemy==1.0.14
-testscenarios==0.5.0
+sqlparse==0.1.19
-testtools==2.0.0
-traceback2==1.4.0
 unittest2==1.1.0
 Werkzeug==0.9.6
-WTForms==2.0.2
+WTForms==2.0.2
-sqlparse==0.1.19

requirements_py2.txt

@@ -1,43 +0,0 @@
-Babel==1.3
-beautifulsoup4==4.4.1
-blinker==1.3
-click==6.6
-extras==0.0.3
-fixtures==2.0.0
-Flask==0.11.1
-Flask-Babel==0.11.1
-Flask-Gravatar==0.4.2
-Flask-HTMLmin==1.2
-Flask-Login==0.3.2
-Flask-Mail==0.9.1
-Flask-Principal==0.4.0
-Flask-Security==1.7.5
-Flask-SQLAlchemy==2.1
-Flask-WTF==0.12
-html5lib==1.0b3
-importlib==1.0.3
-itsdangerous==0.24
-Jinja2==2.7.3
-linecache2==1.0.0
-MarkupSafe==0.23
-passlib==1.6.2
-pbr==1.9.1
-psycopg2==2.6.2
-pycrypto==2.6.1
-pyrsistent==0.11.13
-python-dateutil==2.5.0
-python-mimeparse==1.5.1
-pytz==2014.10
-selenium==3.0.2
-simplejson==3.6.5
-six>=1.9.0
-speaklater==1.3
-SQLAlchemy==1.0.14
-testscenarios==0.5.0
-testtools==2.0.0
-traceback2==1.4.0
-unittest2==1.1.0
-Werkzeug==0.9.6
-WTForms==2.0.2
-sqlparse==0.1.19
-ordereddict; python_version < '2.7'

web/regression/README

@@ -12,6 +12,16 @@ Assumptions
 - Currently each module will have testcases related to ONLY GET, POST, PUT,
   and DELETE api’s.
 
+Environment
+-----------
+
+Regression tests should be run in a Python environment that has all the
+pre-requisite packages installed from $PGADMIN4_SRC/requirements.txt. There
+are some additional dependencies for running the test suite; these can be
+installed with:
+
+(pgadmin4) $ pip install -r $PGADMIN4_SRC/web/regression/requirements.txt
+
 General Information
 -------------------
 

web/regression/requirements.txt

@@ -0,0 +1,4 @@
+selenium==3.0.2
+testscenarios==0.5.0
+testtools==2.0.0
+traceback2==1.4.0