Merge pull request #5023 from gudrutis/IB/CMSSW_11_0_X/gcc700

updated sqlalchemy to version 1.3.4

pip/py2-sqlalchemy.file

@@ -0,0 +1,4 @@
+Patch0: py2-sqlalchemy-1.3.4-add-frontier-dialect
+Patch1: py2-sqlalchemy-1.3.4-fix-sqlite-dialect-timestamp
+
+%define PipPreBuild tar -xzf SQLAlchemy-%{realversion}.tar.gz && pushd SQLAlchemy-%{realversion} && for pch in %{patches} ; do patch -p1 < ${pch} ; done && popd && rm -f SQLAlchemy-%{realversion}.tar.gz && tar czf SQLAlchemy-%{realversion}.tar.gz SQLAlchemy-%{realversion}

pip/requirements.txt

@@ -201,3 +201,4 @@ wrapt==1.11.1
 xgboost==0.82
 xrootdpyfs==0.1.5
 hepdata-lib==0.2.7
+sqlalchemy==1.3.4

py2-sqlalchemy-0.8.2-add-frontier-dialect.patch → py2-sqlalchemy-1.3.4-add-frontier-dialect.patch

@@ -31,18 +31,17 @@ index 0000000..5cbb3d7
 +    def do_rollback(self, dbapi_connection):
 +        pass
 diff --git a/lib/sqlalchemy/dialects/oracle/__init__.py b/lib/sqlalchemy/dialects/oracle/__init__.py
-index 5767907..3d1e556 100644
+index 9f1e15b..d06e3e9 100644
 --- a/lib/sqlalchemy/dialects/oracle/__init__.py
 +++ b/lib/sqlalchemy/dialects/oracle/__init__.py
-@@ -4,7 +4,7 @@
- # This module is part of SQLAlchemy and is released under
- # the MIT License: http://www.opensource.org/licenses/mit-license.php
-
--from sqlalchemy.dialects.oracle import base, cx_oracle, zxjdbc
-+from sqlalchemy.dialects.oracle import base, cx_oracle, zxjdbc, frontier
-
- base.dialect = cx_oracle.dialect
-
+@@ -8,6 +8,7 @@
+ from . import base  # noqa
+ from . import cx_oracle  # noqa
+ from . import zxjdbc  # noqa
++from . import frontier  # noqa
+ from .base import BFILE
+ from .base import BINARY_DOUBLE
+ from .base import BINARY_FLOAT
 diff --git a/lib/sqlalchemy/dialects/oracle/frontier.py b/lib/sqlalchemy/dialects/oracle/frontier.py
 new file mode 100644
 index 0000000..74cde5e

py2-sqlalchemy-1.3.4-fix-sqlite-dialect-timestamp.patch

@@ -0,0 +1,40 @@
+diff --git a/lib/sqlalchemy/processors.py b/lib/sqlalchemy/processors.py
+index 62fc6e9..38a63a4 100644
+--- a/lib/sqlalchemy/processors.py
++++ b/lib/sqlalchemy/processors.py
+@@ -30,12 +30,15 @@ def str_to_datetime_processor_factory(regexp, type_):
+         if value is None:
+             return None
+         else:
++            # in case we got an oracle timestamp:
++            if type(value) == type(1):
++                return datetime.datetime.fromtimestamp( float(value)/1000000000. ).strftime("%Y-%m-%d %H:%M:%S.%f")
+             try:
+                 m = rmatch(value)
+             except TypeError:
+                 raise ValueError(
+                     "Couldn't parse %s string '%r' "
+-                    "- value is not a string." % (type_.__name__, value)
++                    "- value is not a string but %s." % (type_.__name__, value, type(value))
+                 )
+             if m is None:
+                 raise ValueError(
+diff --git a/setup.py b/setup.py
+index aaba737..b30d7b3 100644
+--- a/setup.py
++++ b/setup.py
+@@ -21,10 +21,10 @@ if sys.version_info < (2, 7):
+ cpython = platform.python_implementation() == "CPython"
+
+ ext_modules = [
+-    Extension(
+-        "sqlalchemy.cprocessors",
+-        sources=["lib/sqlalchemy/cextension/processors.c"],
+-    ),
++#    Extension(
++#        "sqlalchemy.cprocessors",
++#        sources=["lib/sqlalchemy/cextension/processors.c"],
++#    ),
+     Extension(
+         "sqlalchemy.cresultproxy",
+         sources=["lib/sqlalchemy/cextension/resultproxy.c"],