githubtakeout 0.1.9__tar.gz → 0.1.10__tar.gz

{githubtakeout-0.1.9/src/githubtakeout.egg-info → githubtakeout-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: githubtakeout
-Version: 0.1.9
+Version: 0.1.10
 Summary: Archive public Git Repos and Gists from GitHub
 Author: Corey Goldberg
 Maintainer: Corey Goldberg
@@ -21,7 +21,6 @@ License-File: LICENSE
 Requires-Dist: GitPython==3.1.45
 Requires-Dist: PyGithub==2.8.1
 Requires-Dist: rich==14.1.0
-Requires-Dist: tenacity==9.1.2
 Dynamic: license-file
 
 # githubtakeout

{githubtakeout-0.1.9 → githubtakeout-0.1.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "githubtakeout"
-version = "0.1.9"
+version = "0.1.10"
 description = "Archive public Git Repos and Gists from GitHub"
 license = "MIT"
 license-files = ["LICENSE"]
@@ -25,7 +25,6 @@ dependencies = [
     "GitPython==3.1.45",
     "PyGithub==2.8.1",
     "rich==14.1.0",
-    "tenacity==9.1.2",
 ]
 
 [project.scripts]

{githubtakeout-0.1.9 → githubtakeout-0.1.10/src/githubtakeout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: githubtakeout
-Version: 0.1.9
+Version: 0.1.10
 Summary: Archive public Git Repos and Gists from GitHub
 Author: Corey Goldberg
 Maintainer: Corey Goldberg
@@ -21,7 +21,6 @@ License-File: LICENSE
 Requires-Dist: GitPython==3.1.45
 Requires-Dist: PyGithub==2.8.1
 Requires-Dist: rich==14.1.0
-Requires-Dist: tenacity==9.1.2
 Dynamic: license-file
 
 # githubtakeout

{githubtakeout-0.1.9 → githubtakeout-0.1.10}/src/githubtakeout.egg-info/requires.txt

@@ -1,4 +1,3 @@
 GitPython==3.1.45
 PyGithub==2.8.1
 rich==14.1.0
-tenacity==9.1.2

{githubtakeout-0.1.9 → githubtakeout-0.1.10}/src/githubtakeout.py

@@ -19,7 +19,6 @@ from timeit import default_timer
 
 import git
 import github
-from tenacity import retry, stop_after_attempt, wait_fixed
 
 from progress import GitProgress
 
@@ -50,52 +49,6 @@ def add_creds(url, username, token):
     return new_url
 
 
-def clone_and_archive_repo(
-    repo_url, local_repo_dir, archive_format, include_history, is_gist=False
-):
-    def remove_readonly(func, path, _):
-        # This is necessary so rmtree() doesn't fail if there are any readonly
-        # dirs/files when trying to delete. This seems to happen after cloning on
-        # Windows. When any error occurs during deletion, we change the permissions
-        # and and reattempt removal.
-        #
-        # give read permissions
-        os.chmod(path, stat.S_IREAD)
-        # give write permissions
-        os.chmod(path, stat.S_IWRITE)
-        # try again
-        func(path)
-
-    try:
-        # delete repo if it already exists
-        shutil.rmtree(local_repo_dir, onexc=remove_readonly)
-    except FileNotFoundError:
-        pass
-    repo_name = urllib.parse.urlparse(repo_url).path.lstrip("/")
-    logger.info(f"cloning repo: {repo_name} to {local_repo_dir}")
-    start = default_timer()
-    clone(repo_url, local_repo_dir, include_history)
-    if not include_history:
-        # delete the .git directory if we are not saving history
-        try:
-            git_dir = os.path.join(local_repo_dir, ".git")
-            shutil.rmtree(git_dir, onexc=remove_readonly)
-        except FileNotFoundError:
-            pass
-    archive_path = archive(local_repo_dir, archive_format, is_gist)
-    size = convert_size(os.path.getsize(archive_path))
-    logger.info(f"archive size: {size}")
-    logger.info("deleting repo")
-    try:
-        # delete repo after archive is created
-        shutil.rmtree(local_repo_dir, onexc=remove_readonly)
-    except FileNotFoundError:
-        pass
-    elapsed = default_timer() - start
-    base_name = os.path.basename(local_repo_dir)
-    logger.info(f"successfully backed up '{base_name}' repo in {elapsed:.3f} secs\n")
-
-
 def archive(local_repo_dir, archive_format="zip", is_gist=False):
     if archive_format not in ARCHIVE_FORMATS:
         raise ValueError(f"{archive_format} is not a valid archive format")
@@ -119,7 +72,6 @@ def archive(local_repo_dir, archive_format="zip", is_gist=False):
     return archive_path
 
 
-@retry(stop=stop_after_attempt(5), wait=wait_fixed(2))
 def clone(repo_url, local_repo_dir, include_history):
     try:
         if include_history:
@@ -149,12 +101,52 @@ def clone(repo_url, local_repo_dir, include_history):
             pass
 
 
-@retry(stop=stop_after_attempt(5), wait=wait_fixed(2))
-def count_repos(repos):
-    return repos.totalCount
+def clone_and_archive_repo(
+    repo_url, local_repo_dir, archive_format, include_history, is_gist=False
+):
+    def remove_readonly(func, path, _):
+        # This is necessary so rmtree() doesn't fail if there are any readonly
+        # dirs/files when trying to delete. This seems to happen after cloning on
+        # Windows. When any error occurs during deletion, we change the permissions
+        # and and reattempt removal.
+        #
+        # give read permissions
+        os.chmod(path, stat.S_IREAD)
+        # give write permissions
+        os.chmod(path, stat.S_IWRITE)
+        # try again
+        func(path)
+
+    try:
+        # delete repo if it already exists
+        shutil.rmtree(local_repo_dir, onexc=remove_readonly)
+    except FileNotFoundError:
+        pass
+    repo_name = urllib.parse.urlparse(repo_url).path.lstrip("/")
+    logger.info(f"cloning repo: {repo_name} to {local_repo_dir}")
+    start = default_timer()
+    clone(repo_url, local_repo_dir, include_history)
+    if not include_history:
+        # delete the .git directory if we are not saving history
+        try:
+            git_dir = os.path.join(local_repo_dir, ".git")
+            shutil.rmtree(git_dir, onexc=remove_readonly)
+        except FileNotFoundError:
+            pass
+    archive_path = archive(local_repo_dir, archive_format, is_gist)
+    size = convert_size(os.path.getsize(archive_path))
+    logger.info(f"archive size: {size}")
+    logger.info("deleting repo")
+    try:
+        # delete repo after archive is created
+        shutil.rmtree(local_repo_dir, onexc=remove_readonly)
+    except FileNotFoundError:
+        pass
+    elapsed = default_timer() - start
+    base_name = os.path.basename(local_repo_dir)
+    logger.info(f"successfully backed up '{base_name}' repo in {elapsed:.3f} secs\n")
 
 
-@retry(stop=stop_after_attempt(5), wait=wait_fixed(2))
 def get_user(username, prompt_token):
     if prompt_token:
         token = getpass.getpass("Token:")
@@ -185,7 +177,7 @@ def get_user(username, prompt_token):
         repos = user.get_repos(affiliation="owner")
         try:
             # this just makes an API request so we can exit if unauthorized
-            _ = count_repos(repos)
+            _ = repos.totalCount
         except github.GithubException as e:
             if e.data["status"] == "401":
                 sys.exit(f"error: invalid auth token for user '{username}'")
@@ -206,7 +198,7 @@ def run(
 ):
     working_dir = os.path.join(base_dir, "backups")
     user, repos, gists, token = get_user(username, prompt_token)
-    num_repos = count_repos(repos)
+    num_repos = repos.totalCount
     if not list_only:
         logger.info(f"creating archives in: {working_dir}\n")
     logger.info(f"found {num_repos} repos for user '{username}'\n")
@@ -218,7 +210,7 @@ def run(
         else:
             clone_and_archive_repo(url, local_repo_dir, archive_format, include_history)
     if include_gists:
-        num_gists = count_repos(gists)
+        num_gists = gists.totalCount
         logger.info("")
         logger.info(f"found {num_gists} gists for user '{username}'\n")
         for gist in gists: