[NRR-6536] Rename Nylas v2 lib path (#5)

* [NRR-6536] Rename Nylas v2 lib path

* Update .bumpversion.cfg

Co-authored-by: Caio Ariede <[email protected]>

* fix version

---------

Co-authored-by: Caio Ariede <[email protected]>

.bumpversion.cfg

@@ -1,6 +1,6 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 5.14.1
+current_version = 5.14.1.0
 
-[bumpversion:file:nylas/_client_sdk_version.py]
+[bumpversion:file:nylasv2/_client_sdk_version.py]

.coveragerc

@@ -1,2 +1,2 @@
 [run]
-source = nylas
+source = nylasv2

nylasv2/_client_sdk_version.py

@@ -0,0 +1 @@
+__VERSION__ = "5.14.1.0"

nylas/client/authentication_models.py → nylasv2/client/authentication_models.py

@@ -1,8 +1,8 @@
 from copy import copy
 
-from nylas.client.restful_model_collection import RestfulModelCollection, CHUNK_SIZE
-from nylas.client.restful_models import NylasAPIObject
-from nylas.utils import AuthMethod
+from nylasv2.client.restful_model_collection import RestfulModelCollection, CHUNK_SIZE
+from nylasv2.client.restful_models import NylasAPIObject
+from nylasv2.utils import AuthMethod
 from enum import Enum
 
 

nylas/client/client.py → nylasv2/client/client.py

@@ -11,12 +11,12 @@
 from urlobject import URLObject
 import six
 from six.moves.urllib.parse import urlencode
-from nylas._client_sdk_version import __VERSION__
-from nylas.client.delta_collection import DeltaCollection
-from nylas.client.errors import MessageRejectedError, NylasApiError, RateLimitError
-from nylas.client.outbox_models import Outbox
-from nylas.client.restful_model_collection import RestfulModelCollection
-from nylas.client.restful_models import (
+from nylasv2._client_sdk_version import __VERSION__
+from nylasv2.client.delta_collection import DeltaCollection
+from nylasv2.client.errors import MessageRejectedError, NylasApiError, RateLimitError
+from nylasv2.client.outbox_models import Outbox
+from nylasv2.client.restful_model_collection import RestfulModelCollection
+from nylasv2.client.restful_models import (
     Calendar,
     Contact,
     Event,
@@ -35,12 +35,12 @@
     Webhook,
     Send,
 )
-from nylas.client.neural_api_models import Neural
-from nylas.client.scheduler_restful_model_collection import (
+from nylasv2.client.neural_api_models import Neural
+from nylasv2.client.scheduler_restful_model_collection import (
     SchedulerRestfulModelCollection,
 )
-from nylas.client.authentication_models import Authentication
-from nylas.utils import timestamp_from_dt, create_request_body, AuthMethod, HttpMethod
+from nylasv2.client.authentication_models import Authentication
+from nylasv2.utils import timestamp_from_dt, create_request_body, AuthMethod, HttpMethod
 
 DEBUG = environ.get("NYLAS_CLIENT_DEBUG")
 API_SERVER = "https://api.nylas.com"
@@ -222,7 +222,7 @@ def token_for_code(self, code):
         Exchange an authorization code for an access token
 
         Args:
-            code (str): One-time authorization code from Nylas
+            code (str): One-time authorization code from nylasv2
 
         Returns:
             str: The access token

nylas/client/delta_collection.py → nylasv2/client/delta_collection.py

@@ -2,7 +2,7 @@
 
 from requests import ReadTimeout
 
-from nylas.client.delta_models import Delta, Deltas
+from nylasv2.client.delta_models import Delta, Deltas
 
 
 class DeltaCollection:

nylas/client/delta_models.py → nylasv2/client/delta_models.py

@@ -1,4 +1,4 @@
-from nylas.client.restful_models import (
+from nylasv2.client.restful_models import (
     RestfulModel,
     NylasAPIObject,
     Contact,

nylas/client/neural_api_models.py → nylasv2/client/neural_api_models.py

@@ -1,5 +1,5 @@
-from nylas.client.restful_models import RestfulModel, Message, File, Contact
-from nylas.utils import HttpMethod
+from nylasv2.client.restful_models import RestfulModel, Message, File, Contact
+from nylasv2.utils import HttpMethod
 import re
 
 

nylas/client/outbox_models.py → nylasv2/client/outbox_models.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 
-from nylas.client.restful_models import RestfulModel, Draft
-from nylas.utils import timestamp_from_dt
+from nylasv2.client.restful_models import RestfulModel, Draft
+from nylasv2.utils import timestamp_from_dt
 
 
 class OutboxMessage(RestfulModel):

nylas/client/restful_model_collection.py → nylasv2/client/restful_model_collection.py

@@ -1,5 +1,5 @@
 from copy import copy
-from nylas.utils import convert_metadata_pairs_to_array
+from nylasv2.utils import convert_metadata_pairs_to_array
 
 CHUNK_SIZE = 50
 
@@ -8,7 +8,7 @@ class RestfulModelCollection(object):
     def __init__(self, cls, api, filter=None, offset=0, **filters):
         if filter:
             filters.update(filter)
-        from nylas.client import APIClient
+        from nylasv2.client import APIClient
 
         if not isinstance(api, APIClient):
             raise Exception("Provided api was not an APIClient.")
@@ -111,7 +111,7 @@ def delete(self, id, data=None, **kwargs):
         return self.api._delete_resource(self.model_class, id, data=data, **kwargs)
 
     def search(self, q, limit=None, offset=None):  # pylint: disable=invalid-name
-        from nylas.client.restful_models import (
+        from nylasv2.client.restful_models import (
             Message,
             Thread,
         )  # pylint: disable=cyclic-import

nylas/client/restful_models.py → nylasv2/client/restful_models.py

@@ -5,9 +5,9 @@
 from enum import Enum
 
 from six import StringIO
-from nylas.client.restful_model_collection import RestfulModelCollection
-from nylas.client.errors import FileUploadError, UnSyncedError, NylasApiError
-from nylas.utils import timestamp_from_dt, AuthMethod
+from nylasv2.client.restful_model_collection import RestfulModelCollection
+from nylasv2.client.errors import FileUploadError, UnSyncedError, NylasApiError
+from nylasv2.utils import timestamp_from_dt, AuthMethod
 
 # pylint: disable=attribute-defined-outside-init
 
@@ -989,15 +989,15 @@ def as_json(self, enforce_read_only=True):
     @staticmethod
     def verify_webhook_signature(nylas_signature, raw_body, client_secret):
         """
-        Verify incoming webhook signature came from Nylas
+        Verify incoming webhook signature came from nylasv2
 
         Args:
             nylas_signature (str): The signature to verify
             raw_body (bytes | bytearray): The raw body from the payload
             client_secret (str): Client secret of the app receiving the webhook
 
         Returns:
-            bool: True if the webhook signature was verified from Nylas
+            bool: True if the webhook signature was verified from nylasv2
         """
         digest = hmac.new(
             str.encode(client_secret), msg=raw_body, digestmod=hashlib.sha256

nylas/client/scheduler_models.py → nylasv2/client/scheduler_models.py

@@ -1,4 +1,4 @@
-from nylas.client.restful_models import RestfulModel
+from nylasv2.client.restful_models import RestfulModel
 
 
 class SchedulerTimeSlot(RestfulModel):

nylas/client/scheduler_restful_model_collection.py → nylasv2/client/scheduler_restful_model_collection.py

@@ -1,10 +1,10 @@
 import copy
 
-from nylas.client.restful_model_collection import RestfulModelCollection
-from nylas.client.restful_models import Scheduler
-from nylas.client.scheduler_models import (
-    SchedulerTimeSlot,
+from nylasv2.client.restful_model_collection import RestfulModelCollection
+from nylasv2.client.restful_models import Scheduler
+from nylasv2.client.scheduler_models import (
     SchedulerBookingConfirmation,
+    SchedulerTimeSlot,
 )
 
 

nylas/services/tunnel.py → nylasv2/services/tunnel.py

@@ -4,9 +4,9 @@
 import json
 from threading import Thread
 
-from nylas.client import APIClient
-from nylas.client.restful_models import Webhook
-from nylas.config import DEFAULT_REGION
+from nylasv2.client import APIClient
+from nylasv2.client.restful_models import Webhook
+from nylasv2.config import DEFAULT_REGION
 
 
 def open_webhook_tunnel(api, config):

setup.py

@@ -1,12 +1,12 @@
-import sys
 import re
 import subprocess
-from setuptools import setup, find_packages
-from setuptools.command.test import test as TestCommand
+import sys
 
+from setuptools import find_packages, setup
+from setuptools.command.test import test as TestCommand
 
 VERSION = ""
-with open("nylas/_client_sdk_version.py", "r") as fd:
+with open("nylasv2/_client_sdk_version.py", "r") as fd:
     VERSION = re.search(
         r'^__VERSION__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE
     ).group(1)
@@ -93,7 +93,7 @@ def main():
             sys.exit()
 
     setup(
-        name="nylas",
+        name="nylasv2",
         version=VERSION,
         packages=find_packages(),
         install_requires=RUN_DEPENDENCIES,