From 9eb649371bea65f12c0b2744f967a11c2d677371 Mon Sep 17 00:00:00 2001 From: izokay Date: Fri, 16 Mar 2018 16:50:31 -0400 Subject: [PATCH 1/2] BUG: Error when ingesting on windows Error message: Cannot create a file when that file already exists: '.catalyst\\data\\marketplace\\temp_bundles\\marketcap-hourly-2018' -> '.catalyst\\data\\marketplace\\marketcap' --- catalyst/marketplace/marketplace.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/catalyst/marketplace/marketplace.py b/catalyst/marketplace/marketplace.py index f72bd661..10936961 100644 --- a/catalyst/marketplace/marketplace.py +++ b/catalyst/marketplace/marketplace.py @@ -430,8 +430,11 @@ class Marketplace: merge_bundles(zsource, ztarget) else: - os.rename(tmp_bundle, bundle_folder) - + try: + os.rename(tmp_bundle, bundle_folder) + except WindowsError: + shutil.rmtree(bundle_folder) + os.rename(tmp_bundle, bundle_folder) pass def ingest(self, ds_name=None, start=None, end=None, force_download=False): From b7779cf363e7746ca9b353910f6e51c006e6451c Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 22 Mar 2018 11:23:06 -0600 Subject: [PATCH 2/2] MAINT: general bug fix for existing path across OS --- catalyst/marketplace/marketplace.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/catalyst/marketplace/marketplace.py b/catalyst/marketplace/marketplace.py index 10936961..1ce9acc0 100644 --- a/catalyst/marketplace/marketplace.py +++ b/catalyst/marketplace/marketplace.py @@ -430,12 +430,8 @@ class Marketplace: merge_bundles(zsource, ztarget) else: - try: - os.rename(tmp_bundle, bundle_folder) - except WindowsError: - shutil.rmtree(bundle_folder) - os.rename(tmp_bundle, bundle_folder) - pass + shutil.rmtree(bundle_folder, ignore_errors=True) + os.rename(tmp_bundle, bundle_folder) def ingest(self, ds_name=None, start=None, end=None, force_download=False): @@ -595,7 +591,6 @@ class Marketplace: folder = get_bundle_folder(ds_name, data_frequency) shutil.rmtree(folder) - pass def create_metadata(self, key, secret, ds_name, data_frequency, desc, has_history=True, has_live=True):