Skip to content

Commit 33d81f0

Browse files
committed
Merge remote-tracking branch 'origin/release/4.0' into release/4.1
2 parents 325c762 + 99e7ac3 commit 33d81f0

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.pyc
2+
.idea

HISTORY.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ Changelog
66

77
* Initial release for DSS 4.1
88

9+
4.0.0 (2018-01-10)
10+
------------------
11+
12+
* Initial release for DSS 4.0
13+
914
3.1.4 (2017-01-03)
1015
-------------------
1116

dataikuapi/dss/dataset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def delete(self, drop_data=False):
2121
"""
2222
Delete the dataset
2323
24-
:param drop_data: Should the data of the dataset be dropped
24+
:param bool drop_data: Should the data of the dataset be dropped
2525
"""
2626
return self.client._perform_empty(
2727
"DELETE", "/projects/%s/datasets/%s" % (self.project_key, self.dataset_name), params = {

dataikuapi/dss/project.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,18 @@ def __init__(self, client, project_key):
2727
# Project deletion
2828
########################################################
2929

30-
def delete(self):
30+
def delete(self, drop_data=False):
3131
"""
3232
Delete the project
3333
3434
This call requires an API key with admin rights
35+
36+
:param bool drop_data: Should the data of managed datasets be dropped
3537
"""
3638
return self.client._perform_empty(
37-
"DELETE", "/projects/%s" % self.project_key)
39+
"DELETE", "/projects/%s" % self.project_key, params = {
40+
"dropData": drop_data
41+
})
3842

3943
########################################################
4044
# Project export
@@ -637,4 +641,4 @@ def with_output(self, name, object_type=None, object_project_key=None, partition
637641
return self
638642

639643
def get_definition(self):
640-
return self.definition
644+
return self.definition

0 commit comments

Comments
 (0)