diff --git a/repo_cloner/lib/cred_helper.py b/repo_cloner/lib/cred_helper.py index 5b7912d..6b8b415 100644 --- a/repo_cloner/lib/cred_helper.py +++ b/repo_cloner/lib/cred_helper.py @@ -28,12 +28,15 @@ def init_gh_token(): def load_gh_token(path: Path): global token - log.info(f"Loading secret github token") - if not path.is_file(): - log.warning(f"Token load did not pass - file not found") - return - # load token - token = path.read_text().strip() + try: + log.info(f"Loading secret github token") + if not path.is_file(): + log.warning(f"Token load did not pass - file not found") + return + # load token + token = path.read_text().strip() + except Exception as e: + log.warning(f"Token reading error: {e.__str__()}") def config_try_override(config_writer: GitConfigParser, section: str, option: str, value: str): diff --git a/repo_cloner/prepare_git_tree.py b/repo_cloner/prepare_git_tree.py index affccb4..753d885 100644 --- a/repo_cloner/prepare_git_tree.py +++ b/repo_cloner/prepare_git_tree.py @@ -21,7 +21,7 @@ def clone_checkout( log.critical(f"Recursion limit reached! breaking") return False - repo = Repo().clone_from(source.as_posix(), to_path = target.as_posix(), progress = GitRemoteProgress(), bare = False) + repo = Repo.clone_from(source.as_posix(), to_path = target.as_posix(), progress = GitRemoteProgress(), bare = False) if reference: log.debug(f"Finding reference: {reference}") try: diff --git a/setup.py b/setup.py index c846088..55d223f 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,14 @@ from setuptools import setup, find_packages +import os -print("Packages:", find_packages()) +with open(os.path.join(os.path.dirname(__file__), "requirements.txt"), "r") as f: + reqs = f.readlines() + +install_requirements = [] +for req in reqs: + req = req.strip() + if "==" in req: + install_requirements.append(req) setup( name = 'repo_cloner', @@ -13,4 +21,5 @@ setup( 'rc-prepare-git-tree=repo_cloner.prepare_git_tree:main', ] }, + install_requires = install_requirements, ) diff --git a/tests/lib/test_cloner.py b/tests/lib/test_cloner.py index a158d6c..c937153 100644 --- a/tests/lib/test_cloner.py +++ b/tests/lib/test_cloner.py @@ -433,7 +433,7 @@ def test_open_initialized(cloner_dir_with_config, path_repo_base, caplog): hashed = gen_repo_hashed_name(path_repo_base.as_uri()) path = cloner_dir_with_config.joinpath("repos", hashed).as_posix() mock.config.cloner_repo_url = path_repo_base.as_uri() - r = git.Repo().clone_from(path_repo_base.as_uri(), path, bare = True) + r = git.Repo.clone_from(path_repo_base.as_uri(), path, bare = True) commit = r.head.commit.hexsha assert r.bare c = Cloner(mock)