Resolve merge conflicts (#21)

* Update test_usage_api.py (#9) * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle date from test_get_billing_cycles (#10) * Removed log function from test base * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle from test_get_billing_cycles * Merging changes to testing test workflows (#12) * Update test_usage_api.py * Sync dev with main (#11) * Update test_usage_api.py (#9) * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle date from test_get_billing_cycles (#10) * Removed log function from test base * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle from test_get_billing_cycles --------- Co-authored-by: santhosh-uc <[email protected]> * Update test_party_analytics_api.py --------- Co-authored-by: santhosh-uc <[email protected]> * New SDK changes (#13) * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge (#14) * Change to run test (#15) * Adding statement to echo secrets in GitHub action workflow (#16) * Change to run test * Adding statement to echo secrets * Update run_sdk_test.yml * Update run_sdk_test.yml * Updated test workflow * Dev to master (#18) * Update test_usage_api.py * Sync dev with main (#11) * Update test_usage_api.py (#9) * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle date from test_get_billing_cycles (#10) * Removed log function from test base * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle from test_get_billing_cycles --------- Co-authored-by: santhosh-uc <[email protected]> * Update test_party_analytics_api.py * New SDK changes (#17) * Update test_usage_api.py (#9) * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle date from test_get_billing_cycles (#10) * Removed log function from test base * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle from test_get_billing_cycles * Merging changes to testing test workflows (#12) * Update test_usage_api.py * Sync dev with main (#11) * Update test_usage_api.py (#9) * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle date from test_get_billing_cycles (#10) * Removed log function from test base * Updated test_get_billing_usage_by_billing_cycle to fetch billing cycle from test_get_billing_cycles --------- Co-authored-by: santhosh-uc <[email protected]> * Update test_party_analytics_api.py --------- Co-authored-by: santhosh-uc <[email protected]> * New SDK changes (#13) * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge * Initial merge (#14) * Change to run test * Change to run test (#15) * Adding statement to echo secrets * Update run_sdk_test.yml * Update run_sdk_test.yml * Updated test workflow * Adding statement to echo secrets in GitHub action workflow (#16) * Change to run test * Adding statement to echo secrets * Update run_sdk_test.yml * Update run_sdk_test.yml * Updated test workflow * Initial merge --------- Co-authored-by: pshenoy-uc <[email protected]> Co-authored-by: santhosh-uc <[email protected]> --------- Co-authored-by: santhosh-uc <[email protected]> Co-authored-by: Snehal Sakhardande <[email protected]> * Resolve merge conflicts --------- Co-authored-by: pshenoy-uc <[email protected]> Co-authored-by: santhosh-uc <[email protected]>
UniCourt · Sep 9, 2024 · 0f66c9e · 0f66c9e
1 parent 61a0a71
commit 0f66c9e
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 7 deletions.
diff --git a/unicourt/api/attorney_analytics_api.py b/unicourt/api/attorney_analytics_api.py
@@ -1756,4 +1756,3 @@ def _search_normalized_attorneys_by_id_serialize(
             _request_auth=_request_auth
         )
 
-
diff --git a/unicourt/api/case_analytics_api.py b/unicourt/api/case_analytics_api.py
@@ -5490,4 +5490,3 @@ def _get_case_count_analytics_by_party_role_group_serialize(
             _request_auth=_request_auth
         )
 
-
diff --git a/unicourt/api/case_documents_api.py b/unicourt/api/case_documents_api.py
@@ -1828,4 +1828,3 @@ def _order_case_document_serialize(
             _request_auth=_request_auth
         )
 
-
diff --git a/unicourt/api/judge_analytics_api.py b/unicourt/api/judge_analytics_api.py
@@ -1756,4 +1756,3 @@ def _search_normalized_judges_by_id_serialize(
             _request_auth=_request_auth
         )
 
-
diff --git a/unicourt/api/law_firm_analytics_api.py b/unicourt/api/law_firm_analytics_api.py
@@ -1756,4 +1756,3 @@ def _search_normalized_law_firms_by_id_serialize(
             _request_auth=_request_auth
         )
 
-
diff --git a/unicourt/api/party_analytics_api.py b/unicourt/api/party_analytics_api.py
@@ -1756,4 +1756,3 @@ def _search_normalized_parties_by_id_serialize(
             _request_auth=_request_auth
         )
 
-
diff --git a/unicourt/api_client.py b/unicourt/api_client.py
@@ -768,4 +768,4 @@ def __deserialize_model(self, data, klass):
         :return: model object.
         """
 
-        return klass.from_dict(data)
+        return klass.from_dict(data)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1756,4 +1756,3 @@ def _search_normalized_attorneys_by_id_serialize(
		_request_auth=_request_auth
		)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5490,4 +5490,3 @@ def _get_case_count_analytics_by_party_role_group_serialize(
		_request_auth=_request_auth
		)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1828,4 +1828,3 @@ def _order_case_document_serialize(
		_request_auth=_request_auth
		)