From dd1178f4b06c56bd27c3c276e7dc2ae60b5def38 Mon Sep 17 00:00:00 2001 From: Catalina Syddall Date: Tue, 6 Aug 2019 11:05:38 -0300 Subject: [PATCH] reordering columns on scraper --- data_scraper/tiingo.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/data_scraper/tiingo.py b/data_scraper/tiingo.py index 3a47b2f..9e562af 100644 --- a/data_scraper/tiingo.py +++ b/data_scraper/tiingo.py @@ -96,9 +96,9 @@ def _save_data(symbol, symbol_df): logger.debug("File %s already downloaded", file_path) else: expected_columns = [ - "symbol", "date", "close", "high", "low", "open", "volume", - "adjClose", "adjHigh", "adjLow", "adjOpen", "adjVolume", "divCash", - "splitFactor" + "symbol", "date", "adjClose", "adjHigh", "adjLow", "adjOpen", + "adjVolume", "close", "divCash", "high", "low", "open", + "splitFactor", "volume" ] if validation.validate_historical_dates( @@ -107,7 +107,7 @@ def _save_data(symbol, symbol_df): merged_df = _merge(symbol, symbol_df) pattern = symbol + "_*" utils.remove_files(symbol_dir, pattern, logger) - + symbol_df = symbol_df.reindex(columns=expected_columns) merged_df.to_csv(file_path, index=False) logger.debug("Saved symbol data as %s", file_path) @@ -125,12 +125,6 @@ def _merge(symbol, symbol_df): parse_dates=["date"], index_col="date") symbol_df.index = symbol_df["date"] - sequence = [ - "symbol", "date", "adjClose", "adjHigh", "adjLow", "adjOpen", - "adjVolume", "close", "divCash", "high", "low", "open", "splitFactor", - "volume" - ] - symbol_df = symbol_df.reindex(columns=sequence) diffs = old_df.index.difference(symbol_df.index) if diffs.empty: