diff --git a/git_metrics.py b/git_metrics.py index 0aa1167..bfd7e54 100644 --- a/git_metrics.py +++ b/git_metrics.py @@ -248,7 +248,8 @@ def find_gl_commits(response, fellow): collect_data() print(f"{term} Completed") time.sleep(30) - if datetime.datetime.now() < batch_start.timedelta(days=21): + now = datetime.datetime.now() + if now < now + datetime.timedelta(days=21): print(f"Collecting Orientation Data for {term}") orientation_data.collect_data(term) print(f"Orientation Data completed for {term}") diff --git a/helpers.py b/helpers.py index 547e579..47547e3 100644 --- a/helpers.py +++ b/helpers.py @@ -2,7 +2,7 @@ import time import requests import gspread -from datetime import datetime +import datetime from pytz import timezone from oauth2client.service_account import ServiceAccountCredentials @@ -118,8 +118,8 @@ def standardize_datetime(raw_datetime, actitivty_type): commit_format = "%a %b %d %H:%M:%S %Y %z" if (actitivty_type == "Pull Request" or actitivty_type == "Issue") and raw_datetime != None and raw_datetime != "Null": - return str(datetime.strptime(raw_datetime, pr_format)) + return str(datetime.datetime.strptime(raw_datetime, pr_format)) if actitivty_type == "Commit" and raw_datetime != None and raw_datetime != "Null": - commit_date = datetime.strptime(raw_datetime, commit_format) + commit_date = datetime.datetime.strptime(raw_datetime, commit_format) return str(commit_date.astimezone(timezone('GMT'))) return raw_datetime