cleanup

Author: suejung-sentry

Makefile

@@ -40,10 +40,8 @@ test.integration:
 	COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy
 
 lint:
-#	make lint.install
-#	make lint.run
-
-	make mypy-check
+	make lint.install
+	make lint.run
 
 lint.install:
 	echo "Installing..."
@@ -59,15 +57,6 @@ lint.check:
 	echo "Formatting..."
 	ruff format --check
 
-
-# Check if mypy and django-stubs are installed and run type checks
-mypy-check:
-	# Install mypy and django-stubs if they aren't already installed
-	pip show mypy > /dev/null || pip install mypy
-	pip show django-stubs > /dev/null || pip install django-stubs
-	# Run mypy with verbose output
-	mypy --config-file mypy.ini .
-
 build.requirements:
 	# if docker pull succeeds, we have already build this version of
 	# requirements.txt.  Otherwise, build and push a version tagged

async_orm_checker.py

@@ -30,7 +30,7 @@ def test_get_bbs_redirect(client, settings, mocker):
         == "https://my.bitbucketserver.com/plugins/servlet/oauth/authorize?oauth_token=SomeToken"
     )
     client_request_mock.assert_called_with(
-        "POST", f"{settings.BITBUCKET_SERVER_URL}/z_plugins/servlet/oauth/request-token"
+        "POST", f"{settings.BITBUCKET_SERVER_URL}/plugins/servlet/oauth/request-token"
     )
 
 
@@ -66,11 +66,11 @@ async def fake_list_teams():
 
     async def fake_api(method, url):
         if method == "POST" and (
-            url.endswith("/z_plugins/servlet/oauth/access-token")
-            or url.endswith("/z_plugins/servlet/oauth/request-token")
+            url.endswith("/plugins/servlet/oauth/access-token")
+            or url.endswith("/plugins/servlet/oauth/request-token")
         ):
             return dict(oauth_token="SomeToken", oauth_token_secret="SomeTokenSecret")
-        elif method == "GET" and url.endswith("/z_plugins/servlet/applinks/whoami"):
+        elif method == "GET" and url.endswith("/plugins/servlet/applinks/whoami"):
             return "ThiagoCodecov"
         elif method == "GET" and ("/users/ThiagoCodecov" in url):
             return dict(

codecov_auth/tests/unit/views/test_bitbucket_server.py

@@ -21,6 +21,7 @@ def resolve_name(account: Account, info: GraphQLResolveInfo) -> str:
 
 
 @account_bindable.field("oktaConfig")
+@sync_to_async
 def resolve_okta_config(
     account: Account, info: GraphQLResolveInfo
 ) -> OktaSettings | None:

graphql_api/tests/test_temp.py

@@ -36,6 +36,7 @@ def resolve_trial_status(plan_service: PlanService, info) -> TrialStatus:
 
 
 @plan_bindable.field("marketingName")
+@sync_to_async
 def resolve_marketing_name(plan_service: PlanService, info) -> str:
     return plan_service.marketing_name
 

graphql_api/types/account/account.py

@@ -8,4 +8,4 @@ follow_imports = silent
 warn_no_return = False
 
 [mypy-*.tests.*]
-disallow_untyped_defs = False
+disallow_untyped_defs = False

graphql_api/types/plan/plan.py

@@ -81,7 +81,7 @@ click==8.1.7
     # via
     #   celery
     #   click-didyoumean
-    #   click-z_plugins
+    #   click-plugins
     #   click-repl
 click-didyoumean==0.3.0
     # via celery