Skip to content

Commit 8ed0fc4

Browse files
matrixstonelqc
matrixstone
authored and
lqc
committed
Add support for Python 3.11
Changes made: * Replace usage of Enum plus str mixin with StrEnum, as per python/cpython#100458 * Sync "typing_extensions" version between requirements.txt and pyproject.toml
1 parent e1e6953 commit 8ed0fc4

86 files changed

Lines changed: 314 additions & 360 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build_and_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
runs-on: ubuntu-latest
5151
strategy:
5252
matrix:
53-
python-version: ["3.8", "3.9", "3.10"]
53+
python-version: ["3.8", "3.9", "3.10", "3.11"]
5454
needs: check-code-quality
5555
steps:
5656
- uses: actions/checkout@v3

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10-bookworm
1+
FROM python:3.11-bookworm
22
LABEL description="Deploy Mage on ECS"
33
ARG FEATURE_BRANCH
44
USER root

‎docs/contributing/charts/how-to-add.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sidebarTitle: "Charts"
88
Add a new type in [`mage_ai/data_preparation/models/widget/constants.py`](https://github.com/mage-ai/mage-ai/blob/master/mage_ai/data_preparation/models/widget/constants.py):
99

1010
```python
11-
class ChartType(str, Enum):
11+
class ChartType(StrEnum):
1212
# ...
1313
PIE_CHART = 'pie_chart'
1414
```

‎mage_ai/ai/constants.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from enum import Enum
1+
from mage_ai.shared.enum import StrEnum
22

33

4-
class LLMUseCase(str, Enum):
4+
class LLMUseCase(StrEnum):
55
GENERATE_DOC_FOR_BLOCK = 'generate_doc_for_block'
66
GENERATE_DOC_FOR_PIPELINE = 'generate_doc_for_pipeline'
77
GENERATE_BLOCK_WITH_DESCRIPTION = 'generate_block_with_description'

‎mage_ai/api/constants.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
from enum import Enum
2-
31
from mage_ai.api.operations.constants import OperationType
42
from mage_ai.orchestration.db.models.oauth import Permission
3+
from mage_ai.shared.enum import StrEnum
54

65

7-
class AttributeOperationType(str, Enum):
6+
class AttributeOperationType(StrEnum):
87
QUERY = 'query'
98
READ = 'read'
109
WRITE = 'write'
1110

1211

13-
class AttributeType(str, Enum):
12+
class AttributeType(StrEnum):
1413
ALL = '__*MAGE*__'
1514

1615

17-
class AuthorizeStatusType(str, Enum):
16+
class AuthorizeStatusType(StrEnum):
1817
ALL = 'all'
1918
FAILED = 'failed'
2019
SUCCEEDED = 'succeeded'

‎mage_ai/api/oauth_scope.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from enum import Enum
1+
from mage_ai.shared.enum import StrEnum
22

33

44
class OauthScope():
@@ -18,7 +18,7 @@ class OauthScope():
1818
TOKEN_SCOPES = []
1919

2020

21-
class OauthScopeType(str, Enum):
21+
class OauthScopeType(StrEnum):
2222
CLIENT_ALL = 'all'
2323
CLIENT_INTERNAL = 'internal'
2424
CLIENT_PRIVATE = 'private'

‎mage_ai/api/operations/constants.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from enum import Enum
1+
from mage_ai.shared.enum import StrEnum
22

33
ALL = 'all'
44
CREATE = 'create'
@@ -20,7 +20,7 @@
2020
COOKIE_PREFIX = '__COOKIE__'
2121

2222

23-
class OperationType(str, Enum):
23+
class OperationType(StrEnum):
2424
ALL = ALL
2525
CREATE = CREATE
2626
DELETE = DELETE

‎mage_ai/authentication/oauth/constants.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
from enum import Enum
21
from typing import Optional
32

43
from mage_ai.settings import get_settings_value
54
from mage_ai.settings.keys import GHE_HOSTNAME
5+
from mage_ai.shared.enum import StrEnum
66

77
ACTIVE_DIRECTORY_CLIENT_ID = '51aec820-9d49-40a9-b046-17c1f28f620d'
88

99
GITHUB_CLIENT_ID = '8577f13ddc81e2848b07'
1010
GITHUB_STATE = '1337'
1111

1212

13-
class ProviderName(str, Enum):
13+
class ProviderName(StrEnum):
1414
ACTIVE_DIRECTORY = 'active_directory'
1515
AZURE_DEVOPS = 'azure_devops'
1616
BITBUCKET = 'bitbucket'

‎mage_ai/authentication/operation_history/constants.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from enum import Enum
1+
from mage_ai.shared.enum import StrEnum
22

33
MAGE_OPERATION_HISTORY_DIRECTORY_DEFAULT = '.operation_history'
44
MAGE_OPERATION_HISTORY_DIRECTORY_ENVIRONMENT_VARIABLE_NAME = 'MAGE_OPERATION_HISTORY_DIRECTORY'
55

66

7-
class ResourceType(str, Enum):
7+
class ResourceType(StrEnum):
88
PIPELINE = 'pipeline'

‎mage_ai/authentication/permissions/constants.py‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
from enum import Enum
2-
31
from mage_ai.api.operations.constants import OperationType
42
from mage_ai.data_preparation.models.constants import BlockType, PipelineType
3+
from mage_ai.shared.enum import IntEnum, StrEnum
54

65

7-
class EntityName(str, Enum):
6+
class EntityName(StrEnum):
87
ALL = 'ALL'
98
ALL_EXCEPT_RESERVED = 'ALL_EXCEPT_RESERVED'
109
AutocompleteItem = 'AutocompleteItem'
@@ -103,7 +102,7 @@ class EntityName(str, Enum):
103102
]
104103

105104

106-
class BaseEntityType(str, Enum):
105+
class BaseEntityType(StrEnum):
107106
pass
108107

109108

@@ -131,7 +130,7 @@ class PipelineEntityType(BaseEntityType):
131130
STREAMING = PipelineType.STREAMING.value
132131

133132

134-
class PermissionAccess(int, Enum):
133+
class PermissionAccess(IntEnum):
135134
OWNER = 1
136135
ADMIN = 2
137136
# Editor: list, detail, create, update, delete
@@ -171,7 +170,7 @@ class PermissionAccess(int, Enum):
171170
DISABLE_UNLESS_CONDITIONS = 1073741824
172171

173172

174-
class PermissionCondition(str, Enum):
173+
class PermissionCondition(StrEnum):
175174
HAS_NOTEBOOK_EDIT_ACCESS = 'HAS_NOTEBOOK_EDIT_ACCESS'
176175
HAS_PIPELINE_EDIT_ACCESS = 'HAS_PIPELINE_EDIT_ACCESS'
177176
USER_OWNS_ENTITY = 'USER_OWNS_ENTITY'

0 commit comments

Comments
 (0)