Rename github_v2 to github, remove old library code

gizmo385 · Jun 24, 2024 · 16069bb · 16069bb
1 parent 66ae470
commit 16069bb
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 164 deletions.
diff --git a/lazy_github/lib/github.py b/lazy_github/lib/github.py
diff --git a/lazy_github/lib/github_v2/auth.py → lazy_github/lib/github/auth.py b/lazy_github/lib/github_v2/auth.py → lazy_github/lib/github/auth.py
@@ -5,7 +5,7 @@
 import httpx
 
 from lazy_github.lib.constants import CONFIG_FOLDER
-from lazy_github.lib.github_v2.constants import DEVICE_CODE_GRANT_TYPE, LAZY_GITHUB_CLIENT_ID
+from lazy_github.lib.github.constants import DEVICE_CODE_GRANT_TYPE, LAZY_GITHUB_CLIENT_ID
 
 # Auth and client globals
 _AUTHENTICATION_CACHE_LOCATION = CONFIG_FOLDER / "auth.text"

diff --git a/lazy_github/lib/github_v2/client.py → lazy_github/lib/github/client.py b/lazy_github/lib/github_v2/client.py → lazy_github/lib/github/client.py
@@ -1,7 +1,7 @@
 import httpx
 
 from lazy_github.lib.config import Config
-from lazy_github.lib.github_v2.constants import JSON_CONTENT_ACCEPT_TYPE
+from lazy_github.lib.github.constants import JSON_CONTENT_ACCEPT_TYPE
 from lazy_github.models.core import User
 
 

diff --git a/lazy_github/lib/github_v2/constants.py → lazy_github/lib/github/constants.py b/lazy_github/lib/github_v2/constants.py → lazy_github/lib/github/constants.py
diff --git a/lazy_github/lib/github_v2/issues.py → lazy_github/lib/github/issues.py b/lazy_github/lib/github_v2/issues.py → lazy_github/lib/github/issues.py
@@ -1,7 +1,7 @@
 from functools import partial
 from typing import Literal
 
-from lazy_github.lib.github_v2.client import GithubClient
+from lazy_github.lib.github.client import GithubClient
 from lazy_github.models.core import Issue, PullRequest, Repository, User
 
 IssueStateFilter = Literal["open"] | Literal["closed"] | Literal["all"]
@@ -31,7 +31,7 @@ async def _list(client: GithubClient, repo: Repository, state: IssueStateFilter)
     import asyncio
 
     from lazy_github.lib.config import Config
-    from lazy_github.lib.github_v2.auth import token
+    from lazy_github.lib.github.auth import token
 
     client = GithubClient(Config.load_config(), token())
     repo = Repository(

diff --git a/lazy_github/lib/github_v2/pull_requests.py → lazy_github/lib/github/pull_requests.py b/lazy_github/lib/github_v2/pull_requests.py → lazy_github/lib/github/pull_requests.py
@@ -1,5 +1,5 @@
-from lazy_github.lib.github_v2.client import GithubClient
-from lazy_github.lib.github_v2.issues import list_all_issues
+from lazy_github.lib.github.client import GithubClient
+from lazy_github.lib.github.issues import list_all_issues
 from lazy_github.models.core import PullRequest, Repository
 
 

diff --git a/lazy_github/lib/github_v2/repositories.py → lazy_github/lib/github/repositories.py b/lazy_github/lib/github_v2/repositories.py → lazy_github/lib/github/repositories.py
@@ -1,7 +1,7 @@
 from functools import partial
 from typing import Literal
 
-from lazy_github.lib.github_v2.client import GithubClient
+from lazy_github.lib.github.client import GithubClient
 from lazy_github.models.core import Repository
 
 RepoTypeFilter = Literal["all"] | Literal["owner"] | Literal["member"]

diff --git a/lazy_github/ui/app.py b/lazy_github/ui/app.py
@@ -3,8 +3,8 @@
 
 import lazy_github.lib.github as g
 from lazy_github.lib.config import Config
-from lazy_github.lib.github_v2.auth import token
-from lazy_github.lib.github_v2.client import GithubClient
+from lazy_github.lib.github.auth import token
+from lazy_github.lib.github.client import GithubClient
 from lazy_github.ui.screens.auth import AuthenticationModal
 from lazy_github.ui.screens.primary import LazyGithubMainScreen
 

diff --git a/lazy_github/ui/screens/auth.py b/lazy_github/ui/screens/auth.py
@@ -8,9 +8,9 @@
 from textual.widget import Widget
 from textual.widgets import Footer
 
-import lazy_github.lib.github_v2.auth as auth
+import lazy_github.lib.github.auth as auth
 from lazy_github.lib.config import Config
-from lazy_github.lib.github_v2.client import GithubClient
+from lazy_github.lib.github.client import GithubClient
 from lazy_github.ui.screens.primary import LazyGithubMainScreen
 
 

diff --git a/lazy_github/ui/screens/primary.py b/lazy_github/ui/screens/primary.py
@@ -6,8 +6,8 @@
 from textual.widget import Widget
 from textual.widgets import Footer, TabbedContent
 
-from lazy_github.lib.github_v2.client import GithubClient
-from lazy_github.lib.github_v2.issues import list_all_issues
+from lazy_github.lib.github.client import GithubClient
+from lazy_github.lib.github.issues import list_all_issues
 from lazy_github.lib.messages import IssuesAndPullRequestsFetched, PullRequestSelected, RepoSelected
 from lazy_github.ui.widgets.actions import ActionsContainer
 from lazy_github.ui.widgets.command_log import CommandLogSection

diff --git a/lazy_github/ui/widgets/pull_requests.py b/lazy_github/ui/widgets/pull_requests.py
@@ -6,8 +6,8 @@
 from textual.coordinate import Coordinate
 from textual.widgets import Label, ListView, Markdown, RichLog, Rule, TabPane
 
-import lazy_github.lib.github_v2.pull_requests as pr_api
-from lazy_github.lib.github_v2.client import GithubClient
+import lazy_github.lib.github.pull_requests as pr_api
+from lazy_github.lib.github.client import GithubClient
 from lazy_github.lib.messages import IssuesAndPullRequestsFetched, PullRequestSelected
 from lazy_github.lib.string_utils import bold, link, pluralize
 from lazy_github.models.core import PullRequest

diff --git a/lazy_github/ui/widgets/repositories.py b/lazy_github/ui/widgets/repositories.py
@@ -4,10 +4,10 @@
 from textual.app import ComposeResult
 from textual.coordinate import Coordinate
 
-import lazy_github.lib.github_v2.repositories as repos_api
+import lazy_github.lib.github.repositories as repos_api
 from lazy_github.lib.config import Config
 from lazy_github.lib.constants import IS_FAVORITED, favorite_string, private_string
-from lazy_github.lib.github_v2.client import GithubClient
+from lazy_github.lib.github.client import GithubClient
 from lazy_github.lib.messages import RepoSelected
 from lazy_github.models.core import Repository
 from lazy_github.ui.widgets.command_log import log_event