Skip to content
This repository was archived by the owner on Mar 13, 2020. It is now read-only.

Commit 5937cfe

Browse files
committed
Ran an automformatter over the files that Walter picked up
1 parent 66b109d commit 5937cfe

File tree

3 files changed

+20
-33
lines changed

3 files changed

+20
-33
lines changed

modules/BatchDataLoader.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66

77
class BatchDataLoader(object):
8-
def __init__(self, data_source, source_table_configuration, target_schema, target_table, columns, data_load_tracker, batch_configuration, target_engine, logger=None):
8+
def __init__(self, data_source, source_table_configuration, target_schema, target_table, columns, data_load_tracker,
9+
batch_configuration, target_engine, logger=None):
910
self.logger = logger or logging.getLogger(__name__)
1011
self.source_table_configuration = source_table_configuration
1112
self.columns = columns
@@ -22,7 +23,8 @@ def load_batch(self, previous_batch_key):
2223

2324
self.logger.debug("ImportBatch Starting from previous_batch_key: {0}".format(previous_batch_key))
2425

25-
data_frame = self.data_source.get_next_data_frame(self.source_table_configuration, self.columns, self.batch_configuration, batch_tracker, previous_batch_key)
26+
data_frame = self.data_source.get_next_data_frame(self.source_table_configuration, self.columns,
27+
self.batch_configuration, batch_tracker, previous_batch_key)
2628

2729
if data_frame is None or len(data_frame) == 0:
2830
self.logger.debug("There are no rows to import, returning -1")
@@ -43,15 +45,15 @@ def write_data_frame_to_table(self, data_frame):
4345
self.logger.debug("Starting write to table {0}".format(qualified_target_table))
4446
data = StringIO()
4547

46-
47-
data_frame.to_csv(data, header=False, index=False, na_rep='', float_format='%.16g')
48+
data_frame.to_csv(data, header=False, index=False, na_rep='', float_format='%.16g')
4849
# Float_format is used to truncate any insignificant digits. Unfortunately it gives us an artificial limitation
4950

5051
data.seek(0)
5152
raw = self.target_engine.raw_connection()
5253
curs = raw.cursor()
5354

54-
column_array = list(map(lambda source_colum_name: self.get_destination_column_name(source_colum_name), data_frame.columns))
55+
column_array = list(
56+
map(lambda source_colum_name: self.get_destination_column_name(source_colum_name), data_frame.columns))
5557
column_list = ','.join(map(str, column_array))
5658

5759
sql = "COPY {0}({1}) FROM STDIN with csv".format(qualified_target_table, column_list)

modules/ColumnTypeResolver.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from sqlalchemy.dialects.postgresql import JSONB
44
from sqlalchemy.dialects.postgresql import UUID
55

6+
67
class ColumnTypeResolver(object):
78
PANDAS_TYPE_MAP = {'string': str,
89
'datetime': str,

setup.py

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,17 @@
11
from setuptools import setup, find_packages
2+
23
setup(name='rdl',
34
version='0.1',
4-
packages = find_packages(),
5+
packages=find_packages(),
56
install_requires=[
6-
'numpy==1.14.2',
7-
'pandas==0.22.0',
8-
'psycopg2==2.7.4',
9-
'pyodbc==4.0.23',
10-
'python-dateutil==2.7.2',
11-
'pytz==2018.4',
12-
'six==1.11.0',
13-
'SQLAlchemy==1.2.7',
14-
'sqlalchemy-citext==1.3.post0'
15-
]
7+
'numpy==1.14.2',
8+
'pandas==0.22.0',
9+
'psycopg2==2.7.4',
10+
'pyodbc==4.0.23',
11+
'python-dateutil==2.7.2',
12+
'pytz==2018.4',
13+
'six==1.11.0',
14+
'SQLAlchemy==1.2.7',
15+
'sqlalchemy-citext==1.3.post0'
16+
]
1617
)
17-
18-
19-
20-
21-
22-
23-
24-
25-
26-
27-
28-
29-
30-
31-
32-
33-

0 commit comments

Comments
 (0)