62
62
63
63
64
64
class KaggleApi (KaggleApi ):
65
- __version__ = '1.5.0 '
65
+ __version__ = '1.5.1.1 '
66
66
67
67
CONFIG_NAME_PROXY = 'proxy'
68
68
CONFIG_NAME_COMPETITION = 'competition'
@@ -172,10 +172,11 @@ def _load_config(self, config_data):
172
172
configuration .proxy = config_data [self .CONFIG_NAME_PROXY ]
173
173
174
174
# Cert File
175
-
175
+
176
176
if self .CONFIG_NAME_SSL_CA_CERT in config_data :
177
- configuration .ssl_ca_cert = config_data [self .CONFIG_NAME_SSL_CA_CERT ]
178
-
177
+ configuration .ssl_ca_cert = config_data [self .
178
+ CONFIG_NAME_SSL_CA_CERT ]
179
+
179
180
# Keep config values with class instance, and load api client!
180
181
181
182
self .config_values = config_data
@@ -1267,8 +1268,8 @@ def dataset_create_version(self,
1267
1268
self .datasets_create_version_by_id_with_http_info (
1268
1269
id_no , request )))
1269
1270
else :
1270
- if ref == self .config_values [self .
1271
- CONFIG_NAME_USER ] + '/INSERT_SLUG_HERE' :
1271
+ if ref == self .config_values [
1272
+ self . CONFIG_NAME_USER ] + '/INSERT_SLUG_HERE' :
1272
1273
raise ValueError (
1273
1274
'Default slug detected, please change values before '
1274
1275
'uploading' )
@@ -1447,7 +1448,8 @@ def dataset_create_new_cli(self,
1447
1448
dir_mode: What to do with directories: "skip" - ignore; "zip" - compress and upload
1448
1449
"""
1449
1450
folder = folder or os .getcwd ()
1450
- result = self .dataset_create_new (folder , public , quiet , convert_to_csv , dir_mode )
1451
+ result = self .dataset_create_new (folder , public , quiet , convert_to_csv ,
1452
+ dir_mode )
1451
1453
if result .invalidTags :
1452
1454
print ('The following are not valid tags and could not be added to '
1453
1455
'the dataset: ' + str (result .invalidTags ))
@@ -2099,10 +2101,9 @@ def download_needed(self, response, outfile, quiet=True):
2099
2101
local_date = datetime .fromtimestamp (os .path .getmtime (outfile ))
2100
2102
if remote_date <= local_date :
2101
2103
if not quiet :
2102
- print (
2103
- os .path .basename (outfile ) +
2104
- ': Skipping, found more recently modified local '
2105
- 'copy (use --force to force download)' )
2104
+ print (os .path .basename (outfile ) +
2105
+ ': Skipping, found more recently modified local '
2106
+ 'copy (use --force to force download)' )
2106
2107
return False
2107
2108
except :
2108
2109
pass
@@ -2227,7 +2228,12 @@ def is_up_to_date(self, server_version):
2227
2228
2228
2229
return True
2229
2230
2230
- def upload_files (self , request , resources , folder , quiet = False , dir_mode = 'skip' ):
2231
+ def upload_files (self ,
2232
+ request ,
2233
+ resources ,
2234
+ folder ,
2235
+ quiet = False ,
2236
+ dir_mode = 'skip' ):
2231
2237
""" upload files in a folder
2232
2238
Parameters
2233
2239
==========
@@ -2244,25 +2250,29 @@ def upload_files(self, request, resources, folder, quiet=False, dir_mode='skip')
2244
2250
full_path = os .path .join (folder , file_name )
2245
2251
2246
2252
if os .path .isfile (full_path ):
2247
- exitcode = self ._upload_file (file_name , full_path , quiet , request , resources )
2253
+ exitcode = self ._upload_file (file_name , full_path , quiet ,
2254
+ request , resources )
2248
2255
if exitcode :
2249
2256
return
2250
2257
elif os .path .isdir (full_path ):
2251
2258
if dir_mode in ['zip' , 'tar' ]:
2252
2259
temp_dir = tempfile .mkdtemp ()
2253
2260
try :
2254
2261
_ , dir_name = os .path .split (full_path )
2255
- archive_path = shutil .make_archive (os .path .join (temp_dir , dir_name ),
2256
- dir_mode , full_path )
2262
+ archive_path = shutil .make_archive (
2263
+ os .path .join (temp_dir , dir_name ), dir_mode ,
2264
+ full_path )
2257
2265
_ , archive_name = os .path .split (archive_path )
2258
- exitcode = self ._upload_file (archive_name , archive_path , quiet , request ,
2259
- resources )
2266
+ exitcode = self ._upload_file (archive_name ,
2267
+ archive_path , quiet ,
2268
+ request , resources )
2260
2269
finally :
2261
2270
shutil .rmtree (temp_dir )
2262
2271
if exitcode :
2263
2272
return
2264
2273
elif not quiet :
2265
- print ("Skipping folder: " + file_name + "; use '--dir-mode' to upload folders" )
2274
+ print ("Skipping folder: " + file_name +
2275
+ "; use '--dir-mode' to upload folders" )
2266
2276
else :
2267
2277
if not quiet :
2268
2278
print ('Skipping: ' + file_name )
@@ -2298,13 +2308,12 @@ def _upload_file(self, file_name, full_path, quiet, request, resources):
2298
2308
if file_name == item .get ('path' ):
2299
2309
upload_file .description = item .get ('description' )
2300
2310
if 'schema' in item :
2301
- fields = self .get_or_default (
2302
- item [ 'schema' ], 'fields' , [])
2311
+ fields = self .get_or_default (item [ 'schema' ], 'fields' ,
2312
+ [])
2303
2313
processed = []
2304
2314
count = 0
2305
2315
for field in fields :
2306
- processed .append (
2307
- self .process_column (field ))
2316
+ processed .append (self .process_column (field ))
2308
2317
processed [count ].order = count
2309
2318
count += 1
2310
2319
upload_file .columns = processed
0 commit comments