Merge pull request kmjennison#102 from kmjennison/kevin/upgrade-ad-ma…

…nager Upgrade Ad Manager API version
polydice · Sep 9, 2020 · de941b2 · de941b2
2 parents 40f942d + 3359027
commit de941b2
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 25 deletions.
diff --git a/dfp/associate_line_items_and_creatives.py b/dfp/associate_line_items_and_creatives.py
@@ -19,7 +19,7 @@ def make_licas(line_item_ids, creative_ids, size_overrides=[]):
  """
  dfp_client = get_client()
  lica_service = dfp_client.GetService(
- 'LineItemCreativeAssociationService', version='v201908')
+ 'LineItemCreativeAssociationService', version='v202008')
 
  sizes = []
 

diff --git a/dfp/create_creatives.py b/dfp/create_creatives.py
@@ -21,7 +21,7 @@ def create_creatives(creatives):
  """
  dfp_client = get_client()
  creative_service = dfp_client.GetService('CreativeService',
- version='v201908')
+ version='v202008')
  creatives = creative_service.createCreatives(creatives)
 
  # Return IDs of created line items.

diff --git a/dfp/create_custom_targeting.py b/dfp/create_custom_targeting.py
@@ -23,7 +23,7 @@ def create_targeting_key(name, display_name=None, key_type='FREEFORM'):
 
  dfp_client = get_client()
  custom_targeting_service = dfp_client.GetService('CustomTargetingService',
- version='v201908')
+ version='v202008')
 
  if display_name is None:
  display_name = name
@@ -60,7 +60,7 @@ def create_targeting_value(name, key_id):
 
  dfp_client = get_client()
  custom_targeting_service = dfp_client.GetService('CustomTargetingService',
- version='v201908')
+ version='v202008')
 
  values_config = [
  {

diff --git a/dfp/create_line_items.py b/dfp/create_line_items.py
@@ -14,7 +14,7 @@ def create_line_items(line_items):
  an array: an array of created line item IDs
  """
  dfp_client = get_client()
- line_item_service = dfp_client.GetService('LineItemService', version='v201908')
+ line_item_service = dfp_client.GetService('LineItemService', version='v202008')
  line_items = line_item_service.createLineItems(line_items)
 
  # Return IDs of created line items.

diff --git a/dfp/create_orders.py b/dfp/create_orders.py
@@ -65,7 +65,7 @@ def create_order(order_name, advertiser_id, trafficker_id):
  create_order_config(name=order_name, advertiser_id=advertiser_id,
  trafficker_id=trafficker_id)
  ]
- order_service = dfp_client.GetService('OrderService', version='v201908')
+ order_service = dfp_client.GetService('OrderService', version='v202008')
  orders = order_service.createOrders(orders)
 
  order = orders[0]

diff --git a/dfp/get_ad_units.py b/dfp/get_ad_units.py
@@ -27,7 +27,7 @@ def get_ad_unit_by_name(ad_unit_name):
 
  dfp_client = get_client()
  ad_unit_service = dfp_client.GetService('InventoryService',
- version='v201908')
+ version='v202008')
 
  query = 'WHERE name = :name'
  values = [

diff --git a/dfp/get_advertisers.py b/dfp/get_advertisers.py
@@ -25,7 +25,7 @@ def create_advertiser(name):
  an integer: the advertiser's DFP ID
  """
  dfp_client = get_client()
- company_service = dfp_client.GetService('CompanyService', version='v201908')
+ company_service = dfp_client.GetService('CompanyService', version='v202008')
 
  advertisers_config = [
  {
@@ -53,7 +53,7 @@ def get_advertiser_id_by_name(name):
  an integer: the advertiser's DFP ID
  """
  dfp_client = get_client()
- company_service = dfp_client.GetService('CompanyService', version='v201908')
+ company_service = dfp_client.GetService('CompanyService', version='v202008')
 
  # Filter by name.
  query = 'WHERE name = :name'

diff --git a/dfp/get_custom_targeting.py b/dfp/get_custom_targeting.py
@@ -21,7 +21,7 @@ def get_key_id_by_name(name):
 
  dfp_client = get_client()
  custom_targeting_service = dfp_client.GetService('CustomTargetingService',
- version='v201908')
+ version='v202008')
 
  # Get a key by name.
  query = ('WHERE name = :name')
@@ -57,7 +57,7 @@ def get_targeting_by_key_name(name):
 
  dfp_client = get_client()
  custom_targeting_service = dfp_client.GetService('CustomTargetingService',
- version='v201908')
+ version='v202008')
 
  # Get a key by name.
  query = ('WHERE name = :name')

diff --git a/dfp/get_orders.py b/dfp/get_orders.py
@@ -22,7 +22,7 @@ def get_order_by_name(order_name):
  """
 
  dfp_client = get_client()
- order_service = dfp_client.GetService('OrderService', version='v201908')
+ order_service = dfp_client.GetService('OrderService', version='v202008')
 
  # Filter by name.
  query = 'WHERE name = :name'
@@ -60,7 +60,7 @@ def get_all_orders(print_orders=False):
  dfp_client = get_client()
 
  # Initialize appropriate service.
- order_service = dfp_client.GetService('OrderService', version='v201908')
+ order_service = dfp_client.GetService('OrderService', version='v202008')
 
  # Create a statement to select orders.
  statement = ad_manager.FilterStatement()

diff --git a/dfp/get_placements.py b/dfp/get_placements.py
@@ -27,7 +27,7 @@ def get_placement_by_name(placement_name):
 
  dfp_client = get_client()
  placement_service = dfp_client.GetService('PlacementService',
- version='v201908')
+ version='v202008')
 
  query = 'WHERE name = :name'
  values = [

diff --git a/dfp/get_users.py b/dfp/get_users.py
@@ -21,7 +21,7 @@ def get_user_id_by_email(email_address):
  an integer: the user's DFP ID
  """
  dfp_client = get_client()
- user_service = dfp_client.GetService('UserService', version='v201908')
+ user_service = dfp_client.GetService('UserService', version='v202008')
 
  # Filter by email address.
  query = 'WHERE email = :email'

diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,6 @@
 colorama==0.4.1
 future==0.17.1
-googleads==23.0.0
+googleads==25.0.0
 mock==3.0.5
 pycryptodome==3.9.0
 PyYAML==5.1.2
diff --git a/tests_integration/helpers/archive_order_by_name.py b/tests_integration/helpers/archive_order_by_name.py
@@ -17,7 +17,7 @@ def archive_order_by_name(order_name):
  None
  """
  client = get_client()
- order_service = client.GetService('OrderService', version='v201908')
+ order_service = client.GetService('OrderService', version='v202008')
 
  statement = (ad_manager.StatementBuilder()
  .Where('name = :name')

diff --git a/tests_integration/helpers/get_advertiser_by_name.py b/tests_integration/helpers/get_advertiser_by_name.py
@@ -18,7 +18,7 @@ def get_advertiser_by_name(advertiser_name):
 
  client = get_client()
  company_service = client.GetService('CompanyService',
- version='v201908')
+ version='v202008')
 
  statement = (ad_manager.StatementBuilder()
  .Where('name = :name')

diff --git a/tests_integration/helpers/get_custom_targeting_by_key_name.py b/tests_integration/helpers/get_custom_targeting_by_key_name.py
@@ -18,7 +18,7 @@ def get_key_by_name(key_name):
 
  client = get_client()
  custom_targeting_service = client.GetService('CustomTargetingService',
- version='v201908')
+ version='v202008')
 
  statement = (ad_manager.StatementBuilder()
  .Where('name = :name')
@@ -46,7 +46,7 @@ def get_custom_targeting_by_key_name(key_name):
 
  client = get_client()
  custom_targeting_service = client.GetService('CustomTargetingService',
- version='v201908')
+ version='v202008')
 
  statement = (ad_manager.StatementBuilder()
  .Where('customTargetingKeyId = :customTargetingKeyId')

diff --git a/tests_integration/helpers/get_line_items_for_order.py b/tests_integration/helpers/get_line_items_for_order.py
@@ -17,7 +17,7 @@ def get_line_items_for_order(order_id):
  """
  print('Getting line items for order ID {0}...'.format(order_id))
  client = get_client()
- line_item_service = client.GetService('LineItemService', version='v201908')
+ line_item_service = client.GetService('LineItemService', version='v202008')
  statement = (ad_manager.StatementBuilder()
  .Where('OrderId = :order_id')
  .WithBindVariable('order_id', order_id))

diff --git a/tests_integration/helpers/get_order_by_name.py b/tests_integration/helpers/get_order_by_name.py
@@ -20,7 +20,7 @@ def get_order_by_name(order_name):
  print('Getting order with order name {0}...'.format(order_name))
 
  client = get_client()
- order_service = client.GetService('OrderService', version='v201908')
+ order_service = client.GetService('OrderService', version='v202008')
 
  statement = (ad_manager.StatementBuilder()
  .Where('name = :name')

diff --git a/tests_integration/helpers/get_placement_by_name.py b/tests_integration/helpers/get_placement_by_name.py
@@ -18,7 +18,7 @@ def get_placement_by_name(placement_name):
 
  client = get_client()
  placement_service = client.GetService('PlacementService',
- version='v201908')
+ version='v202008')
 
  statement = (ad_manager.StatementBuilder()
  .Where('name = :name')

diff --git a/tests_integration/integration_test_new_prebid_partner.py b/tests_integration/integration_test_new_prebid_partner.py
@@ -57,8 +57,8 @@ def tearDown(self):
  archive_order_by_name(order_name)
 
  # TODO: delete custom targeting keys and values
- # https://developers.google.com/doubleclick-publishers/docs/reference/v201908/CustomTargetingService.DeleteCustomTargetingKeys
- # https://developers.google.com/doubleclick-publishers/docs/reference/v201908/CustomTargetingService.DeleteCustomTargetingValues
+ # https://developers.google.com/doubleclick-publishers/docs/reference/v202008/CustomTargetingService.DeleteCustomTargetingKeys
+ # https://developers.google.com/doubleclick-publishers/docs/reference/v202008/CustomTargetingService.DeleteCustomTargetingValues
 
  @patch.multiple('settings',
  DFP_USER_EMAIL_ADDRESS=email,