Oops, Misplaced semi colon.

PFA updated patch.

--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company


On Mon, Nov 20, 2017 at 10:32 PM, pgAdmin 4 Jenkins <jenk...@pgadmin.org>
wrote:

> See <https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> 376/display/redirect?page=changes>
>
> Changes:
>
> [Dave Page] Decode the field separator and quote char if needed.
>
> [Dave Page] Prevent the Windows installer accepting paths containing
> invalid
>
> [Dave Page] Stop Python 2.6 barfing on newer versions of Selenium
>
> [Dave Page] Fix /NOICONS switch in the windows installer. Fixes #1366
>
> ------------------------------------------
> Started by an SCM change
> Started by an SCM change
> Started by an SCM change
> Started by an SCM change
> Started by an SCM change
> Started by an SCM change
> [EnvInject] - Loading node environment variables.
> Building in workspace <https://jenkins.pgadmin.org/
> job/pgadmin4-master-python34/ws/>
>  > git rev-parse --is-inside-work-tree # timeout=10
> Fetching changes from the remote Git repository
>  > git config remote.origin.url git://git.postgresql.org/git/pgadmin4.git
> # timeout=10
> Cleaning workspace
>  > git rev-parse --verify HEAD # timeout=10
> Resetting working tree
>  > git reset --hard # timeout=10
>  > git clean -fdx # timeout=10
> Fetching upstream changes from git://git.postgresql.org/git/pgadmin4.git
>  > git --version # timeout=10
>  > git fetch --tags --progress git://git.postgresql.org/git/pgadmin4.git
> +refs/heads/*:refs/remotes/origin/*
>  > git rev-parse origin/master^{commit} # timeout=10
> Checking out Revision a539147a0e8b4b8852289909b2bcb268d7908887
> (origin/master)
> Commit message: "Fix /NOICONS switch in the windows installer. Fixes #1366"
>  > git config core.sparsecheckout # timeout=10
>  > git checkout -f a539147a0e8b4b8852289909b2bcb268d7908887
>  > git rev-list 8cc1a007b59a6a7c87b4889b6025b1e3b2f251d0 # timeout=10
> [EnvInject] - Executing scripts and injecting environment variables after
> the SCM step.
> [EnvInject] - Injecting as environment variables the properties content
> PYTHON_VERSION=3.4
>
> [EnvInject] - Variables injected successfully.
> [pgadmin4-master-python34] $ /bin/sh -xe /tmp/
> jenkins5396335926824677164.sh
> + <https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/ci/ci_runner.sh>
> EXECUTING: Create pgAdmin config
>
> EXECUTING: Python tests
>
> Creating Python 3.4 virtual environment...
>
> Using base prefix '/usr/local/python-3.4'
> New python executable in <https://jenkins.pgadmin.org/
> job/pgadmin4-master-python34/ws/pgadmin-venv/bin/python3>
> Also creating executable in <https://jenkins.pgadmin.org/
> job/pgadmin4-master-python34/ws/pgadmin-venv/bin/python>
> Installing setuptools, pip, wheel...done.
> Running virtualenv with interpreter /usr/local/python-3.4/bin/python3
> Ignoring importlib: markers 'python_version <= "2.7"' don't match your
> environment
> Ignoring ordereddict: markers 'python_version < "2.7"' don't match your
> environment
> Ignoring backports.csv: markers 'python_version <= "2.7"' don't match your
> environment
> Ignoring Flask-Script: markers 'python_version < "2.7"' don't match your
> environment
> Collecting Babel==2.3.4 (from -r requirements.txt (line 4))
>   Using cached Babel-2.3.4-py2.py3-none-any.whl
> Collecting beautifulsoup4==4.4.1 (from -r requirements.txt (line 5))
>   Using cached beautifulsoup4-4.4.1-py3-none-any.whl
> Collecting blinker==1.3 (from -r requirements.txt (line 6))
> Collecting click==6.6 (from -r requirements.txt (line 7))
>   Using cached click-6.6-py2.py3-none-any.whl
> Collecting extras==0.0.3 (from -r requirements.txt (line 8))
> Collecting fixtures==2.0.0 (from -r requirements.txt (line 9))
>   Using cached fixtures-2.0.0-py2.py3-none-any.whl
> Collecting Flask==0.11.1 (from -r requirements.txt (line 10))
>   Using cached Flask-0.11.1-py2.py3-none-any.whl
> Collecting Flask-Babel==0.11.1 (from -r requirements.txt (line 11))
> Collecting Flask-Gravatar==0.4.2 (from -r requirements.txt (line 12))
>   Using cached Flask_Gravatar-0.4.2-py2.py3-none-any.whl
> Collecting Flask-HTMLmin==1.2 (from -r requirements.txt (line 13))
> Collecting Flask-Login==0.3.2 (from -r requirements.txt (line 14))
> Collecting Flask-Mail==0.9.1 (from -r requirements.txt (line 15))
> Collecting Flask-Migrate==2.0.3 (from -r requirements.txt (line 16))
> Collecting Flask-Principal==0.4.0 (from -r requirements.txt (line 17))
> Collecting Flask-Security==1.7.5 (from -r requirements.txt (line 18))
> Collecting Flask-SQLAlchemy==2.1 (from -r requirements.txt (line 19))
> Collecting Flask-WTF==0.12 (from -r requirements.txt (line 20))
> Collecting html5lib==1.0b3 (from -r requirements.txt (line 21))
> Collecting itsdangerous==0.24 (from -r requirements.txt (line 23))
> Collecting Jinja2==2.7.3 (from -r requirements.txt (line 24))
> Collecting linecache2==1.0.0 (from -r requirements.txt (line 25))
>   Using cached linecache2-1.0.0-py2.py3-none-any.whl
> Collecting MarkupSafe==0.23 (from -r requirements.txt (line 26))
> Collecting passlib==1.6.2 (from -r requirements.txt (line 28))
> Collecting pbr==1.9.1 (from -r requirements.txt (line 29))
>   Using cached pbr-1.9.1-py2.py3-none-any.whl
> Collecting psycopg2>=2.7.3.2 (from -r requirements.txt (line 30))
>   Using cached psycopg2-2.7.3.2-cp34-cp34m-manylinux1_x86_64.whl
> Collecting pycrypto==2.6.1 (from -r requirements.txt (line 31))
> Collecting pyrsistent==0.11.13 (from -r requirements.txt (line 32))
> Collecting python-dateutil==2.5.0 (from -r requirements.txt (line 33))
>   Using cached python_dateutil-2.5.0-py2.py3-none-any.whl
> Collecting python-mimeparse==1.5.1 (from -r requirements.txt (line 34))
> Collecting pytz==2014.10 (from -r requirements.txt (line 35))
>   Using cached pytz-2014.10-py2.py3-none-any.whl
> Collecting simplejson==3.6.5 (from -r requirements.txt (line 36))
> Collecting six>=1.9.0 (from -r requirements.txt (line 37))
>   Using cached six-1.11.0-py2.py3-none-any.whl
> Collecting speaklater==1.3 (from -r requirements.txt (line 38))
> Collecting SQLAlchemy==1.0.14 (from -r requirements.txt (line 39))
> Collecting sqlparse==0.1.19 (from -r requirements.txt (line 40))
> Collecting Werkzeug==0.9.6 (from -r requirements.txt (line 41))
> Collecting WTForms==2.0.2 (from -r requirements.txt (line 42))
>   Using cached WTForms-2.0.2-py2.py3-none-any.whl
> Collecting Flask-Paranoid==0.1.0 (from -r requirements.txt (line 44))
> Collecting testtools>=0.9.22 (from fixtures==2.0.0->-r requirements.txt
> (line 9))
>   Using cached testtools-2.3.0-py2.py3-none-any.whl
> Collecting htmlmin (from Flask-HTMLmin==1.2->-r requirements.txt (line 13))
> Collecting Flask-Script>=0.6 (from Flask-Migrate==2.0.3->-r
> requirements.txt (line 16))
> Collecting alembic>=0.6 (from Flask-Migrate==2.0.3->-r requirements.txt
> (line 16))
> Collecting traceback2 (from testtools>=0.9.22->fixtures==2.0.0->-r
> requirements.txt (line 9))
>   Using cached traceback2-1.4.0-py2.py3-none-any.whl
> Collecting unittest2>=1.0.0 (from testtools>=0.9.22->fixtures==2.0.0->-r
> requirements.txt (line 9))
>   Using cached unittest2-1.1.0-py2.py3-none-any.whl
> Collecting Mako (from alembic>=0.6->Flask-Migrate==2.0.3->-r
> requirements.txt (line 16))
> Collecting python-editor>=0.3 (from alembic>=0.6->Flask-Migrate==2.0.3->-r
> requirements.txt (line 16))
> Collecting argparse (from 
> unittest2>=1.0.0->testtools>=0.9.22->fixtures==2.0.0->-r
> requirements.txt (line 9))
>   Using cached argparse-1.4.0-py2.py3-none-any.whl
> Installing collected packages: pytz, Babel, beautifulsoup4, blinker,
> click, extras, linecache2, traceback2, python-mimeparse, six, argparse,
> unittest2, pbr, testtools, fixtures, Werkzeug, itsdangerous, MarkupSafe,
> Jinja2, Flask, Flask-Babel, Flask-Gravatar, htmlmin, Flask-HTMLmin,
> Flask-Login, Flask-Mail, SQLAlchemy, Flask-SQLAlchemy, Flask-Script, Mako,
> python-dateutil, python-editor, alembic, Flask-Migrate, Flask-Principal,
> passlib, WTForms, Flask-WTF, Flask-Security, html5lib, psycopg2, pycrypto,
> pyrsistent, simplejson, speaklater, sqlparse, Flask-Paranoid
> Successfully installed Babel-2.3.4 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-Migrate-2.0.3 Flask-Paranoid-0.1.0 Flask-Principal-0.4.0
> Flask-SQLAlchemy-2.1 Flask-Script-2.0.6 Flask-Security-1.7.5 Flask-WTF-0.12
> Jinja2-2.7.3 Mako-1.0.7 MarkupSafe-0.23 SQLAlchemy-1.0.14 WTForms-2.0.2
> Werkzeug-0.9.6 alembic-0.9.6 argparse-1.4.0 beautifulsoup4-4.4.1
> blinker-1.3 click-6.6 extras-0.0.3 fixtures-2.0.0 html5lib-1.0b3
> htmlmin-0.1.11 itsdangerous-0.24 linecache2-1.0.0 passlib-1.6.2 pbr-1.9.1
> psycopg2-2.7.3.2 pycrypto-2.6.1 pyrsistent-0.11.13 python-dateutil-2.5.0
> python-editor-1.0.3 python-mimeparse-1.5.1 pytz-2014.10 simplejson-3.6.5
> six-1.11.0 speaklater-1.3 sqlparse-0.1.19 testtools-2.3.0 traceback2-1.4.0
> unittest2-1.1.0
> Invalid requirement: 'selenium==3.3.3 python_version < '2.7''
> Traceback (most recent call last):
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/_vendor/
> packaging/requirements.py",> line 92, in __init__
>     req = REQUIREMENT.parseString(requirement_string)
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/_vendor/pyparsing.py",>
> line 1617, in parseString
>     raise exc
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/_vendor/pyparsing.py",>
> line 1607, in parseString
>     loc, tokens = self._parse( instring, 0 )
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/_vendor/pyparsing.py",>
> line 1379, in _parseNoCache
>     loc,tokens = self.parseImpl( instring, preloc, doActions )
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/_vendor/pyparsing.py",>
> line 3376, in parseImpl
>     loc, exprtokens = e._parse( instring, loc, doActions )
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/_vendor/pyparsing.py",>
> line 1383, in _parseNoCache
>     loc,tokens = self.parseImpl( instring, preloc, doActions )
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/_vendor/pyparsing.py",>
> line 3164, in parseImpl
>     raise ParseException(instring, loc, self.errmsg, self)
> pip._vendor.pyparsing.ParseException: Expected stringEnd (at char 16),
> (line:1, col:17)
>
> During handling of the above exception, another exception occurred:
>
> Traceback (most recent call last):
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/req/req_install.py",>
> line 82, in __init__
>     req = Requirement(req)
>   File "<https://jenkins.pgadmin.org/job/pgadmin4-master-python34/
> ws/pgadmin-venv/lib/python3.4/site-packages/pip/_vendor/
> packaging/requirements.py",> line 96, in __init__
>     requirement_string[e.loc:e.loc + 8]))
> pip._vendor.packaging.requirements.InvalidRequirement: Invalid
> requirement, parse error at "'python_v'"
>
> ERROR: Failed to install the regression test requirements.
> ERROR: Error detected when running the Python tests.
> Build step 'Execute shell' marked build as failure
>
>
diff --git a/web/regression/requirements.txt b/web/regression/requirements.txt
index b5b0146..69f4a27 100644
--- a/web/regression/requirements.txt
+++ b/web/regression/requirements.txt
@@ -1,5 +1,6 @@
 pyperclip~=1.5.27
-selenium==3.7.0
+selenium==3.3.3; python_version < '2.7'
+selenium==3.7.0; python_version >= '2.7'
 testscenarios==0.5.0
 testtools==2.0.0
 traceback2==1.4.0

Reply via email to