Skip to content

Commit aeeebb5

Browse files
Merge pull request #257 from skyflowapi/release/26.5.4
SK-2850: Public Release - loosen transitive dependency version constraints
2 parents dfa9b26 + c072072 commit aeeebb5

6 files changed

Lines changed: 29 additions & 15 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ jobs:
2020
test:
2121
uses: ./.github/workflows/shared-tests.yml
2222
with:
23-
python-version: '3.8'
23+
python-version: '3.9'
2424
secrets: inherit

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ jobs:
99
test:
1010
uses: ./.github/workflows/shared-tests.yml
1111
with:
12-
python-version: '3.8'
12+
python-version: '3.9'

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
python_dateutil >= 2.5.3
22
setuptools >= 21.0.0
3-
urllib3 >= 1.25.3, < 2.1.0
3+
urllib3 >= 1.25.3, < 3
44
pydantic >= 2
55
typing-extensions >= 4.7.1
66
DateTime~=5.5
7-
PyJWT~=2.9.0
7+
PyJWT>=2.12,<3
88
requests~=2.32.3
99
coverage
1010
cryptography
11-
python-dotenv~=1.0.1
11+
python-dotenv>=1.0,<2
1212
httpx

setup.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import sys
66

77

8-
if sys.version_info < (3, 8):
9-
raise RuntimeError("skyflow requires Python 3.8+")
10-
current_version = '2.1.0'
8+
if sys.version_info < (3, 9):
9+
raise RuntimeError("skyflow requires Python 3.9+")
10+
current_version = '2.1.0.dev0+2ce0f02'
1111

1212
with open('README.md', 'r', encoding='utf-8') as f:
1313
long_description = f.read()
@@ -26,15 +26,15 @@
2626
install_requires=[
2727
'python_dateutil >= 2.5.3',
2828
'setuptools >= 75.3.3',
29-
'urllib3 >= 1.25.3, <= 2.6.3',
29+
'urllib3 >= 1.25.3, < 3',
3030
'pydantic >= 2',
3131
'typing-extensions >= 4.7.1',
3232
'DateTime~=5.5',
33-
'PyJWT~=2.9.0',
33+
'PyJWT >= 2.12, < 3',
3434
'requests~=2.32.3',
3535
'coverage',
3636
'cryptography',
37-
'python-dotenv~=1.0.1',
37+
'python-dotenv >= 1.0, < 2',
3838
'httpx'
3939
],
4040
extras_require={
@@ -43,5 +43,5 @@
4343
'ruff'
4444
]
4545
},
46-
python_requires=">=3.8",
46+
python_requires=">=3.9",
4747
)

skyflow/utils/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SDK_VERSION = '2.1.0'
1+
SDK_VERSION = '2.1.0.dev0+2ce0f02'

tests/service_account/test__utils.py

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,25 @@ def test_get_service_account_token_missing_token_uri_key(self):
130130
get_service_account_token(CREDENTIALS_WITHOUT_TOKEN_URI, {}, None)
131131
self.assertEqual(context.exception.message, SkyflowMessages.Error.MISSING_TOKEN_URI.value)
132132

133-
def test_get_service_account_token_with_valid_credentials(self):
133+
@patch("skyflow.service_account._utils.AuthClient")
134+
@patch("skyflow.service_account._utils.get_signed_jwt")
135+
def test_get_service_account_token_with_valid_credentials(self, mock_get_signed_jwt, mock_auth_client):
136+
mock_get_signed_jwt.return_value = "signed"
137+
mock_auth_api = mock_auth_client.return_value.get_auth_api.return_value
138+
mock_auth_api.authentication_service_get_auth_token.return_value = type(
139+
"obj", (), {"access_token": "mock_token", "token_type": "bearer"}
140+
)
134141
access_token, _ = get_service_account_token(VALID_SERVICE_ACCOUNT_CREDS, {}, None)
135142
self.assertTrue(access_token)
136143

137-
def test_get_service_account_token_with_snake_case_creds(self):
144+
@patch("skyflow.service_account._utils.AuthClient")
145+
@patch("skyflow.service_account._utils.get_signed_jwt")
146+
def test_get_service_account_token_with_snake_case_creds(self, mock_get_signed_jwt, mock_auth_client):
147+
mock_get_signed_jwt.return_value = "signed"
148+
mock_auth_api = mock_auth_client.return_value.get_auth_api.return_value
149+
mock_auth_api.authentication_service_get_auth_token.return_value = type(
150+
"obj", (), {"access_token": "mock_token", "token_type": "bearer"}
151+
)
138152
access_token, _ = get_service_account_token(SNAKE_CASE_CREDS, {}, None)
139153
self.assertTrue(access_token)
140154

0 commit comments

Comments
 (0)