remove is_jwt_compatible_python_version checks

Author: mmarchetti

rsconnect/json_web_token.py

@@ -5,7 +5,6 @@
 import base64
 from datetime import datetime, timedelta, timezone
 import os
-import sys
 
 import binascii
 import jwt
@@ -64,14 +63,6 @@ def validate_hs256_secret_key(key: bytes):
         raise RSConnectException("Secret key expected to be at least 32 bytes in length")
 
 
-def is_jwt_compatible_python_version() -> bool:
-    """
-    JWT library is incompatible with Python 3.5
-    """
-
-    return not sys.version_info < (3, 6)
-
-
 def parse_client_response(response):
     """
     Helper to handle the response type from RSConnectClient, because

rsconnect/main.py

@@ -71,7 +71,6 @@
 from .json_web_token import (
     read_secret_key,
     validate_hs256_secret_key,
-    is_jwt_compatible_python_version,
     TokenGenerator,
     produce_bootstrap_output,
     parse_client_response,
@@ -333,11 +332,6 @@ def bootstrap(
     verbose,
 ):
     set_verbosity(verbose)
-    if not is_jwt_compatible_python_version():
-        raise RSConnectException(
-            "Python version > 3.5 required for JWT generation. Please upgrade your Python installation."
-        )
-
     if not server.startswith("http"):
         raise RSConnectException("Server URL expected to begin with transfer protocol (ex. http/https).")
 

tests/test_json_web_token.py

@@ -18,7 +18,6 @@
     SECRET_KEY_ENV,
     read_secret_key,
     produce_bootstrap_output,
-    is_jwt_compatible_python_version,
     parse_client_response,
     TokenGenerator,
     JWTEncoder,
@@ -43,9 +42,6 @@ def are_unix_timestamps_approx_equal(a, b):
 
 class TestJsonWebToken(TestCase):
     def setUp(self):
-        if not is_jwt_compatible_python_version():
-            self.skipTest("JWTs not supported in Python < 3.6")
-
         # decoded copy of the base64-encoded key in testdata/jwt/secret.key
         self.secret_key = b"12345678901234567890123456789012345"
         self.secret_key_b64 = b"MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU="
@@ -186,13 +182,6 @@ def test_parse_client_response(self):
         with pytest.raises(RSConnectException):
             parse_client_response(None)
 
-    def test_is_jwt_compatible_python_version(self):
-        """
-        With setUp() skipping invalid versions, this test should always return True
-        regardless of the particular python env we're running the tests in
-        """
-        self.assertTrue(is_jwt_compatible_python_version())
-
     def test_jwt_encoder_constructor(self):
         encoder = JWTEncoder("issuer", "audience", self.secret_key)
 

tests/test_main.py

@@ -9,7 +9,7 @@
 import pytest
 from click.testing import CliRunner
 
-from rsconnect.json_web_token import SECRET_KEY_ENV, is_jwt_compatible_python_version
+from rsconnect.json_web_token import SECRET_KEY_ENV
 
 from .utils import (
     apply_common_args,
@@ -561,9 +561,6 @@ def test_add_shinyapps_missing_options(self):
 
 class TestBootstrap(TestCase):
     def setUp(self):
-        if not is_jwt_compatible_python_version():
-            self.skipTest("JWTs not supported in Python < 3.6")
-
         self.mock_server = "http://localhost:8080"
         self.mock_uri = "http://localhost:8080/__api__/v1/experimental/bootstrap"
         self.jwt_keypath = "tests/testdata/jwt/secret.key"

tests/test_utils.py

@@ -1,8 +1,6 @@
 from unittest import TestCase
 from datetime import timedelta
 
-from rsconnect.json_web_token import is_jwt_compatible_python_version
-
 from rsconnect.json_web_token import JWTEncoder
 
 from tests.utils import (
@@ -12,10 +10,6 @@
 
 
 class TestJwtUtils(TestCase):
-    def setUp(self):
-        if not is_jwt_compatible_python_version():
-            self.skipTest("JWTs not supported in Python < 3.6")
-
     def test_jwt_decoder(self):
 
         secret = b"12345678912345678912345678912345"