Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bcaf944
DEPS: bump numpy minimum to 1.13.3
h-vetinari Mar 25, 2019
ca28cdb
Fixes
h-vetinari Mar 25, 2019
4830f49
Enforce higher bottleneck version
h-vetinari Mar 25, 2019
49e8a06
Shift mpl pin away from coverage job
h-vetinari Mar 25, 2019
01e2b06
Clean up scipy cruft
h-vetinari Mar 25, 2019
a3e09c2
Reshuffle mpl pins
h-vetinari Mar 26, 2019
27bf206
More numpy cruft
h-vetinari Mar 26, 2019
64fc701
Fix order and pin in azure compat job
h-vetinari Mar 26, 2019
327ef30
Reformulate version bump in whatsnew, add lowest version pins where m…
h-vetinari Mar 26, 2019
f3f7d2b
clean some old sqlalchemy code
h-vetinari Mar 26, 2019
5f2e19b
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 26, 2019
e3d9f6e
Review (jreback)
h-vetinari Mar 26, 2019
182d67c
Fixes
h-vetinari Mar 26, 2019
d0bb930
Lint
h-vetinari Mar 26, 2019
3ea9cd8
Update whatsnew issues references
h-vetinari Mar 26, 2019
ffd86ff
split table in whatsnew (review jreback)
h-vetinari Mar 27, 2019
fb449ea
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 27, 2019
a7d7190
Remove left-over comment
h-vetinari Mar 27, 2019
aad68c6
Remove cython from deps in whatsnew
h-vetinari Mar 27, 2019
fa674e3
Fix wording
h-vetinari Mar 27, 2019
8005679
Reinstate better regexes
h-vetinari Mar 27, 2019
b4288e9
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 27, 2019
e0f8a6d
Review (jreback)
h-vetinari Mar 27, 2019
445a9a2
Simplify regex
h-vetinari Mar 28, 2019
20ad5a5
Merge remote-tracking branch 'upstream/master' into bump_numpy
h-vetinari Mar 28, 2019
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clean some old sqlalchemy code
  • Loading branch information
h-vetinari committed Mar 26, 2019
commit f3f7d2bc9825e84b6f744f3b18290acf0327dce9
14 changes: 0 additions & 14 deletions pandas/io/sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,10 @@ def _is_sqlalchemy_connectable(con):
try:
import sqlalchemy
_SQLALCHEMY_INSTALLED = True

from distutils.version import LooseVersion
ver = sqlalchemy.__version__
# For sqlalchemy versions < 0.8.2, the BIGINT type is recognized
# for a sqlite engine, which results in a warning when trying to
# read/write a DataFrame with int64 values. (GH7433)
if LooseVersion(ver) < LooseVersion('0.8.2'):
from sqlalchemy import BigInteger
from sqlalchemy.ext.compiler import compiles

@compiles(BigInteger, 'sqlite')
def compile_big_int_sqlite(type_, compiler, **kw):
return 'INTEGER'
except ImportError:
_SQLALCHEMY_INSTALLED = False

if _SQLALCHEMY_INSTALLED:
import sqlalchemy
return isinstance(con, sqlalchemy.engine.Connectable)
else:
return False
Expand Down