diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..9173153 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +include *.rst +include LICENSE diff --git a/README.rst b/README.rst index 5d63cef..2047213 100644 --- a/README.rst +++ b/README.rst @@ -30,15 +30,15 @@ A 2048-bit RSA key pair ----------------------- Snowflake Authentication for the Ingest Service requires creating a 2048 bit RSA key pair and, registering the public key with Snowflake. For detailed instructions, -please visit the relevant `Snowflake Documentation Page `_. +please visit the relevant `Snowflake Documentation Page `_. Furl, PyJWT, Requests, and Cryptography --------------------------------------- Internally, the Snowflake Ingest SDK makes use of `Furl `_, -`PyJWT `_, and `Requests `_. -In addition, the `cryptography `_ is used with PyJWT to sign JWT tokens. +`PyJWT `_, and `Requests `_. +In addition, the `cryptography `_ is used with PyJWT to sign JWT tokens. Installation diff --git a/setup.py b/setup.py index 2acbfe1..9ff6655 100644 --- a/setup.py +++ b/setup.py @@ -9,11 +9,11 @@ # We need to know the version to backfill some dependencies from sys import version_info, exit # Define our list of installation dependencies -DEPENDS = ["pyjwt<2.0.0", +DEPENDS = ["pyjwt", "snowflake-connector-python>=2.2.7", - "furl", + "furl", "cryptography", - "requests<2.24.0"] + "requests<=2.28.1"] # If we're at version less than 3.4 - fail if version_info[0] < 3 or version_info[1] < 4: diff --git a/snowflake/ingest/utils/network.py b/snowflake/ingest/utils/network.py index 802cd5c..836003d 100644 --- a/snowflake/ingest/utils/network.py +++ b/snowflake/ingest/utils/network.py @@ -1,3 +1,4 @@ +# import python connector to inject ocsp check method into requests library import snowflake.connector import requests from requests import Response diff --git a/snowflake/ingest/utils/tokentools.py b/snowflake/ingest/utils/tokentools.py index f43e5b2..3349f02 100644 --- a/snowflake/ingest/utils/tokentools.py +++ b/snowflake/ingest/utils/tokentools.py @@ -105,7 +105,7 @@ def get_token(self) -> Text: self.token = jwt.encode(payload, self.private_key, algorithm=SecurityManager.ALGORITHM) logger.info("New Token created") - return self.token.decode('utf-8') + return self.token.decode('utf-8') if isinstance(self.token, bytes) else self.token def calculate_public_key_fingerprint(self, private_key: Text) -> Text: """ diff --git a/snowflake/ingest/version.py b/snowflake/ingest/version.py index 06f9275..c12adf1 100644 --- a/snowflake/ingest/version.py +++ b/snowflake/ingest/version.py @@ -1,3 +1,3 @@ # Copyright (c) 2012-2020 Snowflake Computing Inc. All rights reserved. # Update this for the versions -__version__ = '1.0.4' +__version__ = '1.0.5'