chore: remove unused imports and organize used imports (#246)

tdstein · web-flow · commit 8c74a630b760 · 2024-07-29T09:56:28.000-04:00
diff --git a/examples/connect/dash/app.py b/examples/connect/dash/app.py
@@ -2,15 +2,14 @@
 # mypy: ignore-errors
 import os
 
-from posit.connect.external.databricks import viewer_credentials_provider
-
+import flask
+import pandas as pd
+from dash import Dash, Input, Output, dash_table, html
 from databricks import sql
-from databricks.sdk.service.iam import CurrentUserAPI
 from databricks.sdk.core import ApiClient, Config
+from databricks.sdk.service.iam import CurrentUserAPI
 
-from dash import Dash, html, Output, Input, dash_table
-import pandas as pd
-import flask
+from posit.connect.external.databricks import viewer_credentials_provider
 
 DATABRICKS_HOST = os.getenv("DATABRICKS_HOST")
 DATABRICKS_HOST_URL = f"https://{DATABRICKS_HOST}"
diff --git a/examples/connect/fastapi/app.py b/examples/connect/fastapi/app.py
@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 # mypy: ignore-errors
 import os
-
-from posit.connect.external.databricks import viewer_credentials_provider
-
-from databricks import sql
-
 from typing import Annotated
 
+from databricks import sql
 from fastapi import FastAPI, Header
 from fastapi.responses import JSONResponse
 
+from posit.connect.external.databricks import viewer_credentials_provider
+
 DATABRICKS_HOST = os.getenv("DATABRICKS_HOST")
 DATABRICKS_HOST_URL = f"https://{DATABRICKS_HOST}"
 SQL_HTTP_PATH = os.getenv("DATABRICKS_PATH")
diff --git a/examples/connect/flask/app.py b/examples/connect/flask/app.py
@@ -2,10 +2,11 @@
 # mypy: ignore-errors
 import os
 
-from posit.connect.external.databricks import viewer_credentials_provider
 from databricks import sql
 from flask import Flask, request
 
+from posit.connect.external.databricks import viewer_credentials_provider
+
 DATABRICKS_HOST = os.getenv("DATABRICKS_HOST")
 DATABRICKS_HOST_URL = f"https://{DATABRICKS_HOST}"
 SQL_HTTP_PATH = os.getenv("DATABRICKS_PATH")
diff --git a/examples/connect/shiny-python/app.py b/examples/connect/shiny-python/app.py
@@ -3,15 +3,13 @@
 import os
 
 import pandas as pd
-
-from posit.connect.external.databricks import viewer_credentials_provider
-
 from databricks import sql
-from databricks.sdk.service.iam import CurrentUserAPI
 from databricks.sdk.core import ApiClient, Config
-
+from databricks.sdk.service.iam import CurrentUserAPI
 from shiny import App, Inputs, Outputs, Session, render, ui
 
+from posit.connect.external.databricks import viewer_credentials_provider
+
 DATABRICKS_HOST = os.getenv("DATABRICKS_HOST")
 DATABRICKS_HOST_URL = f"https://{DATABRICKS_HOST}"
 SQL_HTTP_PATH = os.getenv("DATABRICKS_PATH")
diff --git a/examples/connect/streamlit/app.py b/examples/connect/streamlit/app.py
@@ -2,16 +2,15 @@
 # mypy: ignore-errors
 import os
 
-from posit.connect.external.databricks import viewer_credentials_provider
-
-from databricks import sql
-from databricks.sdk.service.iam import CurrentUserAPI
-from databricks.sdk.core import ApiClient, Config
-
 import pandas as pd
 import streamlit as st
+from databricks import sql
+from databricks.sdk.core import ApiClient, Config
+from databricks.sdk.service.iam import CurrentUserAPI
 from streamlit.web.server.websocket_headers import _get_websocket_headers
 
+from posit.connect.external.databricks import viewer_credentials_provider
+
 DATABRICKS_HOST = os.getenv("DATABRICKS_HOST")
 DATABRICKS_HOST_URL = f"https://{DATABRICKS_HOST}"
 SQL_HTTP_PATH = os.getenv("DATABRICKS_PATH")
diff --git a/integration/tests/posit/connect/__init__.py b/integration/tests/posit/connect/__init__.py
@@ -1,5 +1,3 @@
-import os
-
 from packaging import version
 
 from posit import connect
diff --git a/integration/tests/posit/connect/test_content.py b/integration/tests/posit/connect/test_content.py
@@ -1,7 +1,7 @@
 from pathlib import Path
-from packaging import version
 
 import pytest
+from packaging import version
 
 from posit import connect
 
diff --git a/src/posit/connect/bundles.py b/src/posit/connect/bundles.py
@@ -3,9 +3,11 @@
 from __future__ import annotations
 
 import io
-import requests
 from typing import List
-from . import config, resources, tasks, urls
+
+import requests
+
+from . import config, resources, tasks
 
 
 class BundleMetadata(resources.Resource):
diff --git a/src/posit/connect/client.py b/src/posit/connect/client.py
@@ -2,19 +2,19 @@
 
 from __future__ import annotations
 
-from requests import Response, Session
-from typing import Optional, overload
+from typing import overload
 
-from . import hooks, me, urls
+from requests import Response, Session
 
+from . import hooks, me
 from .auth import Auth
 from .config import Config
-from .oauth import OAuthIntegration
 from .content import Content
+from .groups import Groups
 from .metrics import Metrics
+from .oauth import OAuthIntegration
 from .tasks import Tasks
 from .users import User, Users
-from .groups import Groups
 
 
 class Client:
diff --git a/src/posit/connect/config.py b/src/posit/connect/config.py
@@ -1,7 +1,6 @@
 """Client configuration."""
 
 import os
-
 from typing import Optional
 
 from . import urls
diff --git a/src/posit/connect/content.py b/src/posit/connect/content.py
@@ -8,7 +8,7 @@
 
 from requests import Session
 
-from . import tasks, urls
+from . import tasks
 from .bundles import Bundles
 from .config import Config
 from .env import EnvVars
diff --git a/src/posit/connect/cursors.py b/src/posit/connect/cursors.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, make_dataclass
+from dataclasses import dataclass
 from typing import Generator, List
 
 import requests
diff --git a/src/posit/connect/env.py b/src/posit/connect/env.py
@@ -4,7 +4,6 @@
 
 from requests import Session
 
-from . import urls
 from .config import Config
 from .resources import Resources
 
diff --git a/src/posit/connect/groups.py b/src/posit/connect/groups.py
@@ -1,12 +1,11 @@
 """Group resources."""
 
 from __future__ import annotations
+
 from typing import List, overload
 
 import requests
 
-from . import me, urls
-
 from .config import Config
 from .paginator import Paginator
 from .resources import Resource, Resources
diff --git a/src/posit/connect/hooks.py b/src/posit/connect/hooks.py
@@ -1,6 +1,6 @@
 import warnings
-
 from http.client import responses
+
 from requests import JSONDecodeError, Response
 
 from .errors import ClientError
diff --git a/src/posit/connect/me.py b/src/posit/connect/me.py
@@ -1,7 +1,5 @@
 import requests
 
-from . import urls
-
 from .config import Config
 from .users import User
 
diff --git a/src/posit/connect/metrics/__init__.py b/src/posit/connect/metrics/__init__.py
@@ -1,8 +1,6 @@
 """Metric resources."""
 
 from .. import resources
-
-from . import usage
 from .usage import Usage
 
 
diff --git a/src/posit/connect/metrics/shiny_usage.py b/src/posit/connect/metrics/shiny_usage.py
@@ -2,8 +2,6 @@
 
 from typing import List, overload
 
-from .. import urls
-
 from ..cursors import CursorPaginator
 from ..resources import Resource, Resources
 
diff --git a/src/posit/connect/metrics/usage.py b/src/posit/connect/metrics/usage.py
@@ -6,9 +6,8 @@
 
 from requests.sessions import Session as Session
 
-from . import shiny_usage, visits
-
 from .. import resources
+from . import shiny_usage, visits
 
 
 class UsageEvent(resources.Resource):
diff --git a/src/posit/connect/metrics/visits.py b/src/posit/connect/metrics/visits.py
@@ -2,8 +2,6 @@
 
 from typing import List, overload
 
-from .. import urls
-
 from ..cursors import CursorPaginator
 from ..resources import Resource, Resources
 
diff --git a/src/posit/connect/oauth.py b/src/posit/connect/oauth.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from requests import Session
 from typing import Optional, TypedDict
 
-from . import urls
+from requests import Session
+
 from .config import Config
 
 
diff --git a/src/posit/connect/paginator.py b/src/posit/connect/paginator.py
@@ -3,7 +3,6 @@
 
 import requests
 
-
 # The maximum page size supported by the API.
 _MAX_PAGE_SIZE = 500
 
diff --git a/src/posit/connect/permissions.py b/src/posit/connect/permissions.py
@@ -6,8 +6,6 @@
 
 from requests.sessions import Session as Session
 
-from . import urls
-
 from .config import Config
 from .resources import Resource, Resources
 
diff --git a/src/posit/connect/tasks.py b/src/posit/connect/tasks.py
@@ -4,7 +4,7 @@
 
 from typing import List, overload
 
-from . import resources, urls
+from . import resources
 
 
 class Task(resources.Resource):
diff --git a/src/posit/connect/users.py b/src/posit/connect/users.py
@@ -1,12 +1,12 @@
 """User resources."""
 
 from __future__ import annotations
+
 from typing import List, overload
 
 import requests
 
-from . import me, urls
-
+from . import me
 from .config import Config
 from .content import Content
 from .paginator import Paginator
diff --git a/src/posit/connect/variants.py b/src/posit/connect/variants.py
@@ -1,7 +1,7 @@
 from typing import List
+
 from requests import Session
 
-from . import urls
 from .config import Config
 from .resources import Resource, Resources
 from .tasks import Task
diff --git a/tests/posit/connect/api.py b/tests/posit/connect/api.py
@@ -1,7 +1,7 @@
-import pyjson5 as json
-
 from pathlib import Path
 
+import pyjson5 as json
+
 
 def load_mock(path: str) -> dict:
     """
diff --git a/tests/posit/connect/metrics/test_shiny_usage.py b/tests/posit/connect/metrics/test_shiny_usage.py
@@ -1,9 +1,8 @@
-import responses
 import requests
-
+import responses
 from responses import matchers
 
-from posit.connect import Client, config
+from posit.connect import config
 from posit.connect.metrics import shiny_usage
 
 from ..api import load_mock  # type: ignore
diff --git a/tests/posit/connect/metrics/test_usage.py b/tests/posit/connect/metrics/test_usage.py
@@ -1,12 +1,10 @@
 import pytest
 import responses
-
 from responses import matchers
 
 from posit import connect
 from posit.connect.metrics import shiny_usage, usage, visits
 
-
 from ..api import load_mock  # type: ignore
 
 
diff --git a/tests/posit/connect/metrics/test_visits.py b/tests/posit/connect/metrics/test_visits.py
@@ -1,9 +1,8 @@
-import responses
 import requests
-
+import responses
 from responses import matchers
 
-from posit.connect import Client, config
+from posit.connect import config
 from posit.connect.metrics import visits
 
 from ..api import load_mock  # type: ignore
diff --git a/tests/posit/connect/test_bundles.py b/tests/posit/connect/test_bundles.py
@@ -1,17 +1,16 @@
 import io
+from unittest import mock
 
 import pytest
 import requests
 import responses
-
 from responses import matchers
-from unittest import mock
 
 from posit.connect import Client
-from posit.connect.config import Config
 from posit.connect.bundles import Bundle
+from posit.connect.config import Config
 
-from .api import load_mock, get_path  # type: ignore
+from .api import get_path, load_mock  # type: ignore
 
 
 class TestBundleProperties:
diff --git a/tests/posit/connect/test_client.py b/tests/posit/connect/test_client.py
@@ -1,8 +1,8 @@
+from unittest.mock import MagicMock, patch
+
 import pytest
 import responses
 
-from unittest.mock import MagicMock, patch
-
 from posit.connect import Client
 
 from .api import load_mock  # type: ignore
diff --git a/tests/posit/connect/test_config.py b/tests/posit/connect/test_config.py
diff --git a/tests/posit/connect/test_content.py b/tests/posit/connect/test_content.py
diff --git a/tests/posit/connect/test_env.py b/tests/posit/connect/test_env.py
diff --git a/tests/posit/connect/test_groups.py b/tests/posit/connect/test_groups.py
diff --git a/tests/posit/connect/test_hooks.py b/tests/posit/connect/test_hooks.py
diff --git a/tests/posit/connect/test_permissions.py b/tests/posit/connect/test_permissions.py
diff --git a/tests/posit/connect/test_resources.py b/tests/posit/connect/test_resources.py
diff --git a/tests/posit/connect/test_tasks.py b/tests/posit/connect/test_tasks.py
diff --git a/tests/posit/connect/test_users.py b/tests/posit/connect/test_users.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import os`
`2`		`-`
`3`	`1`	`from packaging import version`
`4`	`2`
`5`	`3`	`from posit import connect`