From 0d08cdf168d9d2b48b811f1d0757efa05e9e3472 Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Wed, 21 Sep 2022 13:29:17 -0700 Subject: [PATCH 1/7] Fix 404 on doc link and point to correct page --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 5d63cef..fd95bfc 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,7 @@ 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 From fc7f71c0a9cf55be559c531c1e622d2cce69749d Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Wed, 21 Sep 2022 13:45:53 -0700 Subject: [PATCH 2/7] Update package links too --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index fd95bfc..2047213 100644 --- a/README.rst +++ b/README.rst @@ -37,8 +37,8 @@ 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 From b58efb525f45f9154529a311ab97556070602c59 Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Wed, 21 Sep 2022 16:32:18 -0700 Subject: [PATCH 3/7] update dependency versions --- setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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: From 9063679bc2c81705f432476d0bf243843483df52 Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Wed, 21 Sep 2022 16:33:37 -0700 Subject: [PATCH 4/7] update to 1.0.5 --- snowflake/ingest/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' From be5b20bbb73258d1c8d7a4fb9c187e17fad2c50f Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Wed, 21 Sep 2022 16:40:05 -0700 Subject: [PATCH 5/7] re-add comment --- snowflake/ingest/utils/network.py | 1 + 1 file changed, 1 insertion(+) 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 From 9fed5c12ffd05575f3a1ebe75944b861ba7dc3d8 Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Wed, 21 Sep 2022 16:50:50 -0700 Subject: [PATCH 6/7] Update tokentools.py --- snowflake/ingest/utils/tokentools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: """ From 1f353a69a4f767e74df5fb22c97079a5fccaffd9 Mon Sep 17 00:00:00 2001 From: Xin Huang Date: Wed, 21 Sep 2022 17:01:01 -0700 Subject: [PATCH 7/7] Create MANIFEST.in --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 MANIFEST.in 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