feat: update dependencies for project

TencentBlueKing · Nov 19, 2024 · 06f91bd · 06f91bd
1 parent c03bd1f
commit 06f91bd
Show file tree

Hide file tree

Showing 39 changed files with 117 additions and 123 deletions.
diff --git a/src/bk-user/poetry.lock b/src/bk-user/poetry.lock
diff --git a/src/bk-user/pyproject.toml b/src/bk-user/pyproject.toml
@@ -56,7 +56,7 @@ ldap3 = "2.9.1"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.7.1"
-mypy = "^1.10.1"
+mypy = "1.10.1"
 types-requests = "^2.31.0.1"
 pytest = "^8.3.3"
 pytest-django = "^4.9.0"

diff --git a/src/bk-user/requirements_dev.txt b/src/bk-user/requirements_dev.txt
@@ -54,7 +54,7 @@ kombu==5.4.2 ; python_version >= "3.11" and python_version < "3.12"
 ldap3==2.9.1 ; python_version >= "3.11" and python_version < "3.12"
 markupsafe==3.0.2 ; python_version >= "3.11" and python_version < "3.12"
 mypy-extensions==1.0.0 ; python_version >= "3.11" and python_version < "3.12"
-mypy==1.13.0 ; python_version >= "3.11" and python_version < "3.12"
+mypy==1.10.1 ; python_version >= "3.11" and python_version < "3.12"
 openpyxl==3.1.2 ; python_version >= "3.11" and python_version < "3.12"
 opentelemetry-api==1.24.0 ; python_version >= "3.11" and python_version < "3.12"
 opentelemetry-exporter-otlp-proto-common==1.24.0 ; python_version >= "3.11" and python_version < "3.12"

diff --git a/src/bk-user/tests/apis/conftest.py b/src/bk-user/tests/apis/conftest.py
@@ -18,7 +18,7 @@
 from rest_framework.test import APIClient
 
 
-@pytest.fixture()
+@pytest.fixture
 def api_client(bk_user) -> APIClient:
     """Return an authenticated client"""
     client = APIClient()

diff --git a/src/bk-user/tests/apis/open_v1/conftest.py b/src/bk-user/tests/apis/open_v1/conftest.py
@@ -29,7 +29,7 @@
 from tests.test_utils.tenant import sync_users_depts_to_tenant
 
 
-@pytest.fixture()
+@pytest.fixture
 def open_v1_api_client() -> APIClient:
     client = APIClient()
 
@@ -43,7 +43,7 @@ def open_v1_api_client() -> APIClient:
         yield client
 
 
-@pytest.fixture()
+@pytest.fixture
 def local_data_source(default_tenant, local_ds_plugin_cfg, local_ds_plugin) -> DataSource:
     """默认租户的本地数据源"""
     data_source = DataSource.objects.create(

diff --git a/src/bk-user/tests/apis/open_v2/conftest.py b/src/bk-user/tests/apis/open_v2/conftest.py
@@ -29,7 +29,7 @@
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture()
+@pytest.fixture
 def local_data_source(default_tenant, local_ds_plugin_cfg, local_ds_plugin) -> DataSource:
     """默认租户的本地数据源"""
     data_source = DataSource.objects.create(
@@ -43,7 +43,7 @@ def local_data_source(default_tenant, local_ds_plugin_cfg, local_ds_plugin) -> D
     return data_source
 
 
-@pytest.fixture()
+@pytest.fixture
 def collaboration_data_source(default_tenant, random_tenant, general_ds_plugin_cfg, general_ds_plugin) -> DataSource:
     """向默认租户进行同步的通用 HTTP 数据源"""
     data_source = DataSource.objects.create(

diff --git a/src/bk-user/tests/apis/open_v2/test_departments.py b/src/bk-user/tests/apis/open_v2/test_departments.py
@@ -138,7 +138,7 @@ def test_with_invalid_dept_id(self, api_client):
 
 
 class TestListProfileDepartments:
-    @pytest.fixture()
+    @pytest.fixture
     def user_lushi(self, default_tenant, local_data_source) -> TenantUser:
         return TenantUser.objects.get(
             tenant=default_tenant,

diff --git a/src/bk-user/tests/apis/web/collaboration/conftest.py b/src/bk-user/tests/apis/web/collaboration/conftest.py
@@ -23,13 +23,13 @@
 from tests.test_utils.tenant import create_tenant
 
 
-@pytest.fixture()
+@pytest.fixture
 def collaboration_tenant() -> Tenant:
     """创建随机的协同租户"""
     return create_tenant(generate_random_string())
 
 
-@pytest.fixture()
+@pytest.fixture
 def strategy_source_config() -> Dict:
     return {
         "organization_scope_type": CollaborationScopeType.ALL,
@@ -39,7 +39,7 @@ def strategy_source_config() -> Dict:
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def strategy_target_config(random_tenant, collaboration_tenant) -> Dict:
     return {
         "organization_scope_type": CollaborationScopeType.ALL,
@@ -67,15 +67,15 @@ def _create_strategy(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def collaborate_to_strategy(
     random_tenant, collaboration_tenant, strategy_source_config, strategy_target_config
 ) -> CollaborationStrategy:
     """创建协同策略（本租户分享出去的）"""
     return _create_strategy(random_tenant, collaboration_tenant, strategy_source_config, strategy_target_config)
 
 
-@pytest.fixture()
+@pytest.fixture
 def collaborate_from_strategy(
     random_tenant, collaboration_tenant, strategy_source_config, strategy_target_config
 ) -> CollaborationStrategy:
@@ -120,11 +120,11 @@ def _create_tenant_custom_fields(tenant: Tenant) -> None:
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def _init_random_tenant_custom_fields(random_tenant):
     _create_tenant_custom_fields(random_tenant)
 
 
-@pytest.fixture()
+@pytest.fixture
 def _init_collaboration_tenant_custom_fields(collaboration_tenant):
     _create_tenant_custom_fields(collaboration_tenant)
diff --git a/src/bk-user/tests/apis/web/data_source/conftest.py b/src/bk-user/tests/apis/web/data_source/conftest.py
@@ -36,7 +36,7 @@
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture()
+@pytest.fixture
 def data_source(random_tenant, local_ds_plugin_cfg) -> DataSource:
     # FIXME (su) 使用 data_source 这个 fixture 其实可以不用 random_tenant，因为使用了 get_or_create
     # 在移除默认租户的初始化 migration 中创建的 real 类型的数据源后，可以批量删除 random_tenant 逻辑
@@ -49,7 +49,7 @@ def data_source(random_tenant, local_ds_plugin_cfg) -> DataSource:
     return ds
 
 
-@pytest.fixture()
+@pytest.fixture
 def local_idp(data_source) -> Idp:
     return Idp.objects.create(
         name="local",
@@ -60,7 +60,7 @@ def local_idp(data_source) -> Idp:
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def disabled_idp(data_source) -> Idp:
     return Idp.objects.create(
         name="invalid_wecom",
@@ -74,7 +74,7 @@ def disabled_idp(data_source) -> Idp:
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def wecom_idp(data_source) -> Idp:
     return Idp.objects.create(
         name="wecom",
@@ -87,7 +87,7 @@ def wecom_idp(data_source) -> Idp:
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def field_mapping(request) -> List[Dict]:
     """字段映射，不含自定义字段"""
     fields = ["username", "full_name", "phone_country_code", "phone", "email"]
@@ -97,13 +97,13 @@ def field_mapping(request) -> List[Dict]:
     return [{"source_field": f, "mapping_operation": "direct", "target_field": f} for f in fields]
 
 
-@pytest.fixture()
+@pytest.fixture
 def sync_config() -> Dict[str, Any]:
     """数据源同步配置"""
     return {"sync_period": 30}
 
 
-@pytest.fixture()
+@pytest.fixture
 def data_source_sync_tasks(data_source) -> List[DataSourceSyncTask]:
     success_task = DataSourceSyncTask.objects.create(
         data_source=data_source,

diff --git a/src/bk-user/tests/apis/web/idp/test_idp.py b/src/bk-user/tests/apis/web/idp/test_idp.py
@@ -31,7 +31,7 @@
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture()
+@pytest.fixture
 def wecom_plugin_cfg() -> Dict[str, Any]:
     """企业微信插件配置"""
     return {
@@ -41,7 +41,7 @@ def wecom_plugin_cfg() -> Dict[str, Any]:
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def data_source_match_rules(bare_general_data_source) -> List[Dict[str, Any]]:
     """匹配数据源规则"""
     return [
@@ -53,7 +53,7 @@ def data_source_match_rules(bare_general_data_source) -> List[Dict[str, Any]]:
     ]
 
 
-@pytest.fixture()
+@pytest.fixture
 def wecom_idp(bk_user, random_tenant, wecom_plugin_cfg, data_source_match_rules) -> Idp:
     return Idp.objects.create(
         name=generate_random_string(),

diff --git a/src/bk-user/tests/apis/web/organization/conftest.py b/src/bk-user/tests/apis/web/organization/conftest.py
@@ -91,31 +91,31 @@ def _create_tenant_custom_fields(tenant: Tenant) -> List[TenantUserCustomField]:
     return [age_field, gender_field, region_field, hobbies_field]
 
 
-@pytest.fixture()
+@pytest.fixture
 def random_tenant_custom_fields(random_tenant) -> List[TenantUserCustomField]:
     """随机租户的自定义字段"""
     return _create_tenant_custom_fields(random_tenant)
 
 
-@pytest.fixture()
+@pytest.fixture
 def collaboration_tenant_custom_fields(collaboration_tenant) -> List[TenantUserCustomField]:
     """协同租户的自定义字段"""
     return _create_tenant_custom_fields(collaboration_tenant)
 
 
-@pytest.fixture()
+@pytest.fixture
 def _init_tenant_users_depts(random_tenant, full_local_data_source, random_tenant_custom_fields) -> None:
     """初始化租户部门 & 租户用户"""
     sync_users_depts_to_tenant(random_tenant, full_local_data_source)
 
 
-@pytest.fixture()
+@pytest.fixture
 def collaboration_tenant() -> Tenant:
     """创建随机的协同租户"""
     return create_tenant(generate_random_string())
 
 
-@pytest.fixture()
+@pytest.fixture
 def _init_collaboration_users_depts(
     random_tenant,
     collaboration_tenant,

diff --git a/src/bk-user/tests/apis/web/organization/test_user.py b/src/bk-user/tests/apis/web/organization/test_user.py
@@ -189,7 +189,7 @@ def test_collaboration_tenant(self, api_client, random_tenant, collaboration_ten
 
 
 class TestTenantUserCreateApi:
-    @pytest.fixture()
+    @pytest.fixture
     def tenant_user_data(self, random_tenant) -> Dict[str, Any]:
         username = generate_random_string()
         return {
@@ -591,7 +591,7 @@ def test_standard(self, api_client, random_tenant):
 class TestTenantUserBatchCreateAndPreviewApi:
     """测试快速录入（批量创建）用户 * 预览 API"""
 
-    @pytest.fixture()
+    @pytest.fixture
     def raw_user_infos(self) -> List[str]:
         # username full_name email phone age gender region hobbies
         return [

diff --git a/src/bk-user/tests/apis/web/password/test_password.py b/src/bk-user/tests/apis/web/password/test_password.py
@@ -37,7 +37,7 @@
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture()
+@pytest.fixture
 def tenant_user(random_tenant, full_local_data_source) -> TenantUser:
     init_local_data_source_identity_infos(full_local_data_source)
     sync_users_depts_to_tenant(random_tenant, full_local_data_source)

diff --git a/src/bk-user/tests/apis/web/personal_center/test_personal_center.py b/src/bk-user/tests/apis/web/personal_center/test_personal_center.py
@@ -25,7 +25,7 @@
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture()
+@pytest.fixture
 def tenant_user(bk_user) -> TenantUser:
     return TenantUser.objects.get(tenant_id=bk_user.get_property("tenant_id"), id=bk_user.username)
 

diff --git a/src/bk-user/tests/apis/web/tenant_setting/conftest.py b/src/bk-user/tests/apis/web/tenant_setting/conftest.py
@@ -23,7 +23,7 @@
 pytestmark = pytest.mark.django_db
 
 
-@pytest.fixture()
+@pytest.fixture
 def custom_fields(default_tenant):
     custom_field_data = [
         {

diff --git a/src/bk-user/tests/apps/data_source/test_models.py b/src/bk-user/tests/apps/data_source/test_models.py
@@ -26,7 +26,7 @@
 FAKE_PASSWORD = "Pa-@-114514-2887"
 
 
-@pytest.fixture()
+@pytest.fixture
 def local_ds_with_sensitive(bare_local_data_source) -> DataSource:
     """包含敏感信息的本地数据源"""
     plugin_config = bare_local_data_source.plugin_config