mgaughan/24_deb_pkg_gov
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
Matthew Gaughan 2023-11-08 10:55:48 -06:00
commit 268ca229a2
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.py
View File

@ -23,7 +23,7 @@ import gh_gsql_req as ghs
def main(): def main():
# we should discuss whether we're using the 93 day window that seems to be widely used or if we want a longer window # we should discuss whether we're using the 93 day window that seems to be widely used or if we want a longer window
early_cutoff = dt.datetime(2013,11, 6) early_cutoff = dt.datetime(2013,11, 8)
print("Earliest date examined: " + str(early_cutoff)) print("Earliest date examined: " + str(early_cutoff))
#largest_object = {} #largest_object = {}
#manifest = '../kaylea_dissertation/lifecycle/package_metadata/jupyter-notebook_manifest.yaml' #manifest = '../kaylea_dissertation/lifecycle/package_metadata/jupyter-notebook_manifest.yaml'
@ -57,7 +57,8 @@ def get_everything(manifest_path, early_cutoff):
#below lines will probably need to be refactored as tasks expand #below lines will probably need to be refactored as tasks expand
vcs_path = config['Upstream_VCS'] vcs_path = config['Upstream_VCS']
print("------------------") print("------------------")
#print(vcs_path) #print(vcs_path) return
try:
repo_path = vcs_path[0] repo_path = vcs_path[0]
largest_object[repo_path] = {} largest_object[repo_path] = {}
largest_object[repo_path]["perceval_obj"] = pt.main(vcs_path, early_cutoff) largest_object[repo_path]["perceval_obj"] = pt.main(vcs_path, early_cutoff)
@ -84,8 +85,10 @@ def get_everything(manifest_path, early_cutoff):
largest_object[repo_path]['ghs_obj'] = ghs.main(vcs_path, early_cutoff) largest_object[repo_path]['ghs_obj'] = ghs.main(vcs_path, early_cutoff)
#print(ghs_obj["time_cleaned_comm"]) #print(ghs_obj["time_cleaned_comm"])
repo_uri_list = repo_path.split('/') repo_uri_list = repo_path.split('/')
with open('/data/users/mgaughan/kkex_data_110823/' + repo_uri_list[-2] + '_' + repo_uri_list[-1] + '_result.json', 'w') as data_path: with open('/data/users/mgaughan/kkex_data_110823_1/' + repo_uri_list[-2] + '_' + repo_uri_list[-1] + '_result.json', 'w') as data_path:
json.dump(largest_object[repo_path], data_path) json.dump(largest_object[repo_path], data_path)
except:
print("miscellanea error in the main body")
except yaml.YAMLError as err: except yaml.YAMLError as err:
print(err) print(err)
print("----------------------") print("----------------------")

2
perceval_tasks.py
View File

@ -23,8 +23,8 @@ def main(vcs_path, begin_date):
# this is the primary function for getting the list of commits from perceval # this is the primary function for getting the list of commits from perceval
def get_perceval_log(vcs_path, begin_date): def get_perceval_log(vcs_path, begin_date):
print(vcs_path) print(vcs_path)
repo_dir = '/data/users/mgaughan/tmp/' + str(vcs_path[0].split('/')[-1])
try: try:
repo_dir = '/data/users/mgaughan/tmp/' + str(vcs_path[0].split('/')[-1])
#gitpath=repo_dir #gitpath=repo_dir
repo = Git(uri=vcs_path[0], gitpath=repo_dir) repo = Git(uri=vcs_path[0], gitpath=repo_dir)
# this is a temporary date_from, will need to be more inclusive in the future # this is a temporary date_from, will need to be more inclusive in the future