rebuild

Author: matthewdeanmartin

Makefile

@@ -31,7 +31,7 @@ clean: clean-pyc clean-test
 # tests are often slow and linting is fast, so run tests on linted code.
 test: clean poetry.lock
 	@echo "Running unit tests"
-	$(VENV) pytest --doctest-modules git_mirror
+	$(VENV) pytest --doctest-modules git_mirror -n 2
 	# $(VENV) python -m unittest discover
 	$(VENV) py.test tests -vv -n 2 --cov=git_mirror --cov-report=html --cov-fail-under 50
 	$(VENV) bash basic_help.sh
@@ -78,7 +78,7 @@ bandit: .build_history/bandit
 .PHONY: pylint
 .build_history/pylint: .build_history .build_history/isort .build_history/black $(FILES)
 	@echo "Linting with pylint"
-	$(VENV) ruff --fix
+	$(VENV) ruff check --fix
 	$(VENV) pylint git_mirror --fail-under 9.8
 	@touch .build_history/pylint
 

docs/TODO.md

@@ -1,3 +1,10 @@
+## Top Top Priority
+- Rename to gittyup
+- Change selfhosted to self-hosted-gitlab
+- Maybe shows some minimal output before running a command (config)
+- Support flat directory structure for gitlab
+- Support repo to folder map?
+
 ## Top priority
 - PAT token init help
 - platform dirs for config files

git_mirror.toml

@@ -15,7 +15,7 @@ include_private = true
 include_forks = false
 
 [tool.git-mirror.selfhosted]
-type = "gitlab"
+type = "gitlab" # host_type?
 user_name = "mmartin"
 url = "http://git.example.com"
 pypi_owner_name = "Matthew Martin"

git_mirror/__main__.py

@@ -496,4 +496,5 @@ def host_specific_args(parser: argparse.ArgumentParser, use_github: bool, use_gi
 
 
 if __name__ == "__main__":
+    # sys.exit(main(["list-repos","--host=selfhosted","--verbose"], use_selfhosted=True))
     sys.exit(main(sys.argv[1:]))

git_mirror/manage_github.py

@@ -619,7 +619,7 @@ def version_info(self) -> dict[str, Any]:
         Return API version information.
         """
         # pygithub doesn't support this endpoint?
-        response = httpx.get(f"{self.host_domain}/versions")
+        response = httpx.get(f"{self.host_domain}/versions", timeout=10)
         response.raise_for_status()  # Raises an exception for 4XX/5XX responses
         data = response.json()
         versions_supported = data["info"]["version"]

git_mirror/manage_pypi.py

@@ -71,7 +71,7 @@ class PyPiManager:
 
     def __init__(self, pypi_owner_name: Optional[str] = None):
         self.pypi_owner_name = pypi_owner_name
-        self.client = httpx.AsyncClient()
+        self.client = httpx.AsyncClient()  # nosec
 
     async def get_info(self, package_name: str) -> tuple[dict[str, Any], int]:
         """

git_mirror/pat_init.py

@@ -26,7 +26,7 @@ def check_pat_validity(token: str) -> bool:
     """
     headers = {"Authorization": f"token {token}"}
     try:
-        response = httpx.get("https://api.github.com/user", headers=headers)
+        response = httpx.get("https://api.github.com/user", headers=headers, timeout=10)
         return response.status_code == 200
     except httpx.RequestError as e:
         console.print(f"An error occurred while checking PAT validity: {e}", style="danger")

git_mirror/pat_init_gitlab.py

@@ -26,7 +26,7 @@ def check_pat_validity(token: str) -> bool:
     """
     headers = {"Authorization": f"Bearer {token}"}
     try:
-        response = httpx.get("https://gitlab.com/api/v4/user", headers=headers)
+        response = httpx.get("https://gitlab.com/api/v4/user", headers=headers, timeout=10)
         return response.status_code == 200
     except httpx.RequestError as e:
         console.print(f"An error occurred while checking PAT validity: {e}", style="danger")

git_mirror/version_check.py

@@ -21,7 +21,7 @@ def call_pypi_with_version_check(package_name: str, current_version: str) -> tup
         bool: True if the latest version on PyPI is greater than the current version, False otherwise.
     """
     pypi_url = f"https://pypi.org/pypi/{package_name}/json"
-    response = httpx.get(pypi_url)
+    response = httpx.get(pypi_url, timeout=10)
     response.raise_for_status()  # Raises an exception for 4XX/5XX responses
     data = response.json()
     latest_version = data["info"]["version"]

poetry.lock

@@ -15,6 +15,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 include = [
     "git_mirror/**/*.py",

pyproject.toml

@@ -23,7 +23,7 @@ def test_call_pypi_with_version_check_available_newer_version():
 
         assert result is True
         assert new_version == expected_version
-        httpx_get_mock.assert_called_once_with("https://pypi.org/pypi/git_mirror/json")
+        httpx_get_mock.assert_called_once_with("https://pypi.org/pypi/git_mirror/json", timeout=10)
 
 
 def test_call_pypi_with_version_check_no_newer_version():
@@ -36,7 +36,7 @@ def test_call_pypi_with_version_check_no_newer_version():
 
         assert result is False
         assert new_version == version.parse("1.0.0")
-        httpx_get_mock.assert_called_once_with("https://pypi.org/pypi/git_mirror/json")
+        httpx_get_mock.assert_called_once_with("https://pypi.org/pypi/git_mirror/json", timeout=10)
 
 
 def test_call_pypi_with_version_check_http_error():

tests/tests_bot/test_run_git_mirror_gpt35/test_version_check.py

@@ -1,17 +1,17 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
 envlist =
-;    py38-opensearch{1,2,3,4,5,6}
     py39
     py310
     py311
     py312
+    py313
 
 [testenv]
 deps =
     # parameterized
-    pytest==7.4.4
-    pytest-cov==4.1.0
+    pytest>7.4.4
+    pytest-cov>4.1.0
     pytest-mock
     hypothesis>=6.96.0
 commands =