diff --git a/libraries/github.py b/libraries/github.py index 26e957a7..f8c37e21 100644 --- a/libraries/github.py +++ b/libraries/github.py @@ -130,7 +130,9 @@ def get_commits( all_commits.extend(page) except Exception as e: - self.logger.exception("get_all_commits_failed", repo=repo_slug, msg=str(e)) + self.logger.exception( + "get_all_commits_failed", repo=repo_slug, exc_msg=str(e) + ) return [] return all_commits @@ -617,7 +619,7 @@ def get_library_list(self, gitmodules=None): return libraries - def update_libraries(self): + def update_libraries(self, since: datetime = None, until: datetime = None): """Update all libraries with the metadata""" raw_gitmodules = self.client.get_gitmodules() gitmodules = self.parser.parse_gitmodules(raw_gitmodules.decode("utf-8")) @@ -633,10 +635,7 @@ def update_libraries(self): continue self.update_categories(obj, categories=lib["category"]) self.update_authors(obj, authors=lib["authors"]) - self.update_monthly_commit_counts(obj) - self.update_issues(obj) - self.update_prs(obj) - + self.update_monthly_commit_counts(obj, since=since, until=until) if not obj.first_github_tag_date: self.update_first_github_tag_date(obj) diff --git a/libraries/tasks.py b/libraries/tasks.py index 771d1952..b496039b 100644 --- a/libraries/tasks.py +++ b/libraries/tasks.py @@ -4,6 +4,7 @@ from config.celery import app from libraries.github import LibraryUpdater +from libraries.utils import get_first_last_day_last_month logger = structlog.getLogger(__name__) @@ -28,7 +29,8 @@ def update_libraries(): from GitHub. """ + since, until = get_first_last_day_last_month() updater = LibraryUpdater() - updater.update_libraries() + updater.update_libraries(since=since, until=until) logger.info("libraries_tasks_update_libraries_finished") diff --git a/libraries/tests/test_utils.py b/libraries/tests/test_utils.py index 1ee8e87f..a374c130 100644 --- a/libraries/tests/test_utils.py +++ b/libraries/tests/test_utils.py @@ -1,4 +1,4 @@ -from datetime import datetime, timedelta +from datetime import datetime from dateutil.relativedelta import relativedelta import os @@ -37,10 +37,6 @@ def test_get_first_last_day_last_month(): # Assert that the last day is the last day of the month assert (last_day + relativedelta(days=1)).day == 1 - # Assert that the difference between first day and last day is within one month - assert (last_day - first_day) < timedelta(days=31) - assert (last_day - first_day) >= timedelta(days=28) - # Assert that both dates are less than today's date assert first_day < datetime.now() assert last_day < datetime.now()