Fixed code conflits

tests/api/release_items/test_release_items_api.py

@@ -1,11 +1,7 @@
 import os
 import unittest
 from dotenv import load_dotenv
-<<<<<<< HEAD
-from contentstack_management import contentstack
-=======
 import contentstack_management
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
 from tests.cred import get_credentials
 
 credentials = get_credentials()
@@ -18,11 +14,7 @@
 class ReleaseItemsApiTests(unittest.TestCase):
 
     def setUp(self):
-<<<<<<< HEAD
-        self.client = contentstack.ContentstackClient(host=host)
-=======
         self.client = contentstack_management.Client(host=host)
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
         self.client.login(username, password)
 
     def test_get_all_item(self):

tests/api/releases/test_releases_api.py

@@ -1,11 +1,7 @@
 import os
 import unittest
 from dotenv import load_dotenv
-<<<<<<< HEAD
-from contentstack_management import contentstack
-=======
 import contentstack_management
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
 from tests.cred import get_credentials
 
 credentials = get_credentials()
@@ -20,11 +16,7 @@
 class ReleaseApiTests(unittest.TestCase):
 
     def setUp(self):
-<<<<<<< HEAD
-        self.client = contentstack.ContentstackClient(host=host)
-=======
         self.client = contentstack_management.Client(host=host)
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
         self.client.login(username, password)
 
     def test_get_all_releases(self):
@@ -85,18 +77,8 @@ def test_clone(self):
     def test_deploy(self):
         data = {
                 "release": {
-<<<<<<< HEAD
-                    "scheduled_at": "2023-09-27T13:13:13:122Z",
-                    "action": "publish",
                     "environments": [
                         "development"
-                    ],
-                    "locales": [
-                        "en-us"
-=======
-                    "environments": [
-                        "development"
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
                     ]
                 }
             }

tests/cred.py

@@ -36,14 +36,10 @@
 default_terms_uid = "terms_uid" #Default terms uid
 default_terms_string = "terms_string" #Default terms string
 default_release_uid = "release_uid" #default release uid
-<<<<<<< HEAD
-
-=======
 default_delivery_token_uid = "delivery_token_uid" #default delivery token uid
 default_management_token_uid = "management_token_uid" #default management token uid
 default_publish_queue_uid = "publish_queue_uid" # default publish queue uid
 default_extension_uid = "extension_uid" # default publish queue uid
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
 
 def get_credentials():
     load_dotenv()
@@ -86,13 +82,9 @@ def get_credentials():
         "terms_uid": os.getenv("TERMS_UID", default_terms_uid),
         "terms_string": os.getenv("TERMS_STRING", default_terms_string),
         "release_uid": os.getenv("RELEASE_UID", default_release_uid),
-<<<<<<< HEAD
-
-=======
         "delivery_token_uid": os.getenv("DELIVERY_TOKEN_UID", default_delivery_token_uid),
         "management_token_uid": os.getenv("MANAGEMENT_TOKEN_UID", default_management_token_uid),
         "publish_queue_uid": os.getenv("PUBLISH_QUEUE_UID", default_publish_queue_uid),
         "extension_uid": os.getenv("EXTENSION_UID", default_extension_uid)
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
     }
     return credentials

tests/mock/release_items/test_release_items_mock.py

@@ -2,11 +2,7 @@
 import json
 import unittest
 from dotenv import load_dotenv
-<<<<<<< HEAD
-from contentstack_management import contentstack
-=======
 import contentstack_management
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
 from tests.cred import get_credentials
 
 credentials = get_credentials()
@@ -19,11 +15,7 @@
 class ReleaseItemsMockTests(unittest.TestCase):
 
     def setUp(self):
-<<<<<<< HEAD
-        self.client = contentstack.ContentstackClient(host=host)
-=======
         self.client = contentstack_management.Client(host=host)
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
         self.client.login(username, password)
 
     def read_file(self, file_name):

tests/mock/releases/test_releases_mock.py

@@ -3,11 +3,7 @@
 import unittest
 
 from dotenv import load_dotenv
-<<<<<<< HEAD
-from contentstack_management import contentstack
-=======
 import contentstack_management
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
 from tests.cred import get_credentials
 
 credentials = get_credentials()
@@ -22,11 +18,7 @@ class ReleasesMockTests(unittest.TestCase):
 
     def setUp(self):
 
-<<<<<<< HEAD
-        self.client = contentstack.ContentstackClient(host = host)
-=======
         self.client = contentstack_management.Client(host = host)
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
         self.client.login(username, password)
 
 
@@ -100,20 +92,8 @@ def test_clone(self):
     def test_deploy(self):
         data = {
                 "release": {
-<<<<<<< HEAD
-                    "scheduled_at": "2018-12-12T13:13:13:122Z",
-                    "action": "publish/unpublish",
-                    "environments": [
-                        "Production",
-                        "UAT"
-                    ],
-                    "locales": [
-                        "en-us",
-                        "ja-jp"
-=======
                     "environments": [
                         "development"
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
                     ]
                 }
             }

tests/unit/release_items/test_release_items_unit.py

@@ -1,11 +1,7 @@
 import os
 import unittest
 from dotenv import load_dotenv
-<<<<<<< HEAD
-from contentstack_management import contentstack
-=======
 import contentstack_management
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
 from tests.cred import get_credentials
 
 credentials = get_credentials()
@@ -18,11 +14,7 @@
 class ReleaseItemsUnitTests(unittest.TestCase):
 
     def setUp(self):
-<<<<<<< HEAD
-        self.client = contentstack.ContentstackClient(host=host)
-=======
         self.client = contentstack_management.Client(host=host)
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
         self.client.login(username, password)
 
     def test_get_all_item(self):
@@ -107,11 +99,7 @@ def test_delete_multiple(self):
                 }]
             }
         response = self.client.stack(api_key).releases(releases_uid).item().delete_multiple(data)
-<<<<<<< HEAD
-        self.assertEqual(response.request.url, f"{self.client.endpoint}releases/{releases_uid}/items")
-=======
         self.assertEqual(response.request.url, f"{self.client.endpoint}releases/{releases_uid}/items?all=True")
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
         self.assertEqual(response.request.method, "DELETE")
         self.assertEqual(response.request.headers["Content-Type"], "application/json")
 

tests/unit/releases/test_release_unit.py

@@ -1,11 +1,7 @@
 import os
 import unittest
 from dotenv import load_dotenv
-<<<<<<< HEAD
-from contentstack_management import contentstack
-=======
 import contentstack_management
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
 from tests.cred import get_credentials
 
 credentials = get_credentials()
@@ -20,11 +16,7 @@
 class ReleaseUnitTests(unittest.TestCase):
 
     def setUp(self):
-<<<<<<< HEAD
-        self.client = contentstack.ContentstackClient(host=host)
-=======
         self.client = contentstack_management.Client(host=host)
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
         self.client.login(username, password)
 
     def test_get_all_releases(self):
@@ -92,20 +84,8 @@ def test_clone(self):
     def test_deploy(self):
         data = {
                 "release": {
-<<<<<<< HEAD
-                    "scheduled_at": "2018-12-12T13:13:13:122Z",
-                    "action": "publish/unpublish",
-                    "environments": [
-                        "Production",
-                        "UAT"
-                    ],
-                    "locales": [
-                        "en-us",
-                        "ja-jp"
-=======
                     "environments": [
                         "development"
->>>>>>> fff0f0fb49c9346070ad6dbf76e64808c5aeb364
                     ]
                 }
             }