Skip to content

Commit 0c2d3e9

Browse files
committed
Shufflepy bump
1 parent 72bbfdb commit 0c2d3e9

3 files changed

Lines changed: 18 additions & 4 deletions

File tree

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ liquidpy==0.8.2
55
flask[async]==3.1.0
66
waitress==3.0.2
77
python-dateutil==2.9.0.post0
8-
shufflepy==0.1.7
8+
shufflepy==0.2.2

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name='shuffle_sdk',
5-
version='0.0.31',
5+
version='0.0.33',
66
description='The SDK used for Shuffle',
77
py_modules=["shuffle_sdk"],
88
license='MIT',
@@ -21,7 +21,7 @@
2121
"waitress==3.0.2",
2222
"python-dateutil==2.9.0.post0",
2323
"PyJWT==2.10.1",
24-
"shufflepy==0.1.8",
24+
"shufflepy==0.2.2",
2525
],
2626
classifiers=[
2727
'Programming Language :: Python :: 3',

shuffle_sdk/shuffle_sdk.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1524,7 +1524,7 @@ def get_file_category(self, category):
15241524
# Things to consider for files:
15251525
# - How can you download / stream a file?
15261526
# - Can you decide if you want a stream or the files directly?
1527-
def get_file(self, value):
1527+
def get_file(self, value, category=""):
15281528
full_execution = self.full_execution
15291529
org_id = full_execution["workflow"]["execution_org"]["id"]
15301530

@@ -1805,6 +1805,18 @@ def set_files(self, infiles):
18051805
self.logger.info(f"KeyError in file setup: {e}")
18061806
pass
18071807

1808+
try:
1809+
data["namespace"] = curfile["namespace"]
1810+
except KeyError as e:
1811+
#self.logger.info(f"KeyError in file setup for namespace: {e}")
1812+
pass
1813+
1814+
try:
1815+
data["namespace"] = curfile["category"]
1816+
except KeyError as e:
1817+
#self.logger.info(f"KeyError in file setup for category: {e}")
1818+
pass
1819+
18081820
ret = requests.post("%s%s" % (self.url, create_path), headers=headers, json=data, verify=False, proxies=self.proxy_config)
18091821
#self.logger.info(f"Ret CREATE: {ret.text}")
18101822
cur_id = ""
@@ -2071,6 +2083,8 @@ def execute_action(self, action):
20712083
if newkey.startswith("'") and newkey.endswith("'"):
20722084
newkey = newkey[1:-1]
20732085

2086+
print("KEY: %s" % newkey)
2087+
20742088
if newkey == "shuffle_authorization":
20752089
self.authorization = keysplit[1]
20762090
continue

0 commit comments

Comments
 (0)