10000 changed default version back and use auto-detect server version · SnarkyPapi/server-client-python@9de5063 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9de5063

Browse files
author
bzhang
committed
changed default version back and use auto-detect server version
1 parent 3d196dd commit 9de5063

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

‎samples/materialize_workbooks.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,18 @@ def main():
5151

5252
def show_materialized_views_status(args, password, site_content_url):
5353
tableau_auth = TSC.TableauAuth(args.username, password, site_id=site_content_url)
54-
server = TSC.Server(args.server)
54+
server = TSC.Server(args.server, use_server_version=True)
5555
enabled_sites = set()
5656
with server.auth.sign_in(tableau_auth):
5757
# For server admin, this will prints all the materialized views enabled sites
5858
# For other users, this only prints the status of the site they belong to
59-
print("Materialized views is enabled on sites:")
59+
print "Materialized views is enabled on sites:"
6060
for site in TSC.Pager(server.sites):
6161
if site.materialized_views_enabled:
6262
enabled_sites.add(site)
6363
print "Site name:", site.name
64-
print
64+
print '\n'
65+
6566
print("Materialized views is enabled on workbooks:")
6667
# Individual workbooks can be enabled only when the sites they belong to are enabled too
6768
for site in enabled_sites:
@@ -74,7 +75,7 @@ def show_materialized_views_status(args, password, site_content_url):
7475

7576
def update_workbook(args, enable_materialized_views, password, site_content_url):
7677
tableau_auth = TSC.TableauAuth(args.username, password, site_id=site_content_url)
77-
server = TSC.Server(args.server)
78+
server = TSC.Server(args.server, use_server_version=True)
7879
# Now it updates all the workbooks in the site
7980
# To update selected ones please use filter:
8081
# https://github.com/tableau/server-client-python/blob/master/docs/docs/filter-sort.md
@@ -86,19 +87,19 @@ def update_workbook(args, enable_materialized_views, password, site_content_url)
8687
server.workbooks.update(workbook)
8788
site = server.sites.get_by_content_url(site_content_url)
8889
print "Updated materialized views settings for workbook:", workbook.name, "from site:", site.name
89-
print
90+
print '\n'
9091

9192

9293
def update_site(args, enable_materialized_views, password, site_content_url):
9394
tableau_auth = TSC.TableauAuth(args.username, password, site_id=site_content_url)
94-
server = TSC.Server(args.server)
95+
server = TSC.Server(args.server, use_server_version=True)
9596
with server.auth.sign_in(tableau_auth):
9697
site_to_update = server.sites.get_by_content_url(site_content_url)
9798
site_to_update.materialized_views_enabled = enable_materialized_views
9899

99100
server.sites.update(site_to_update)
100101
print "Updated materialized views settings for site:", site_to_update.name
101-
print
102+
print '\n'
102103

103104

104105
if __name__ == "__main__":

‎tableauserverclient/server/endpoint/sites_endpoint.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def get_by_content_url(self, content_url):
5656
return SiteItem.from_response(server_response.content, self.parent_srv.namespace)[0]
5757

5858
# Update site
59-
@api(version="3.3")
59+
@api(version="2.0")
6060
def update(self, site_item):
6161
if not site_item.id:
6262
error = "Site item missing ID."

‎tableauserverclient/server/endpoint/workbooks_endpoint.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def baseurl(self):
3131
return "{0}/sites/{1}/workbooks".format(self.parent_srv.baseurl, self.parent_srv.site_id)
3232

3333
# Get all workbooks on site
34-
@api(version="3.3")
34+
@api(version="2.0")
3535
def get(self, req_options=None):
3636
logger.info('Querying all workbooks on site')
3737
url = self.baseurl
@@ -41,7 +41,7 @@ def get(self, req_options=None):
4141
return all_workbook_items, pagination_item
4242

4343
# Get 1 workbook
44-
@api(version="3.3")
44+
@api(version="2.0")
4545
def get_by_id(self, workbook_id):
4646
if not workbook_id:
4747
error = "Workbook ID undefined."
@@ -70,7 +70,7 @@ def delete(self, workbook_id):
7070
logger.info('Deleted single workbook (ID: {0})'.format(workbook_id))
7171

7272
# Update workbook
73-
@api(version="3.3")
73+
@api(version="2.0")
7474
def update(self, workbook_item):
7575
if not workbook_item.id:
7676
error = "Workbook item missing ID. Workbook must be retrieved from server first."

‎tableauserverclient/server/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(self, server_address, use_server_version=False):
3636
self._session = requests.Session()
3737
self._http_options = dict()
3838

39-
self.version = "3.3"
39+
self.version = "2.3"
4040
self.auth = Auth(self)
4141
self.views = Views(self)
4242
self.users = Users(self)

‎test/test_group.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff F400 line numberDiff line change
@@ -123,7 +123,7 @@ def test_add_user_before_populating(self):
123123
add_user_response = f.read().decode('utf-8')
124124
with requests_mock.mock() as m:
125125
m.get(self.baseurl, text=get_xml_response)
126-
m.post('http://test/api/3.3/sites/dad65087-b08b-4603-af4e-2887b8aafc67/groups/ef8b19c0-43b6-11e6-af50'
126+
m.post('http://test/api/2.3/sites/dad65087-b08b-4603-af4e-2887b8aafc67/groups/ef8b19c0-43b6-11e6-af50'
127127
'-63f5805dbe3c/users', text=add_user_response)
128128
all_groups, pagination_item = self.server.groups.get()
129129
single_group = all_groups[0]
@@ -151,7 +151,7 @@ def test_remove_user_before_populating(self):
151151
response_xml = f.read().decode('utf-8')
152152
with requests_mock.mock() as m:
153153
m.get(self.baseurl, text=response_xml)
154-
m.delete('http://test/api/3.3/sites/dad65087-b08b-4603-af4e-2887b8aafc67/groups/ef8b19c0-43b6-11e6-af50'
154+
m.delete('http://test/api/2.3/sites/dad65087-b08b-4603-af4e-2887b8aafc67/groups/ef8b19c0-43b6-11e6-af50'
155155
'-63f5805dbe3c/users/5de011f8-5aa9-4d5b-b991-f462c8dd6bb7',
156156
text='ok')
157157
all_groups, pagination_item = self.server.groups.get()

‎test/test_schedule.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def test_update(self):
187187
single_schedule.interval_item.interval)
188188

189189
def test_add_workbook(self):
190-
self.server.version = "3.3"
190+
self.server.version = "2.8"
191191
baseurl = "{}/sites/{}/schedules".format(self.server.baseurl, self.server.site_id)
192192

193193
with open(WORKBOOK_GET_BY_ID_XML, "rb") as f:

0 commit comments

Comments
 (0)
0