Skip to content

Fix Typo For CP.org Script #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 30, 2019
Merged

Fix Typo For CP.org Script #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
300637f
'TRAIVS' isn't exactly going to be in the 'TRAVIS' env vars. :face_palm:
sommersoft May 30, 2019
edde947
PEP8 is great!
sommersoft May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 48 additions & 19 deletions adabot/update_cp_org_libraries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,16 @@
from adabot import github_requests as github

# Setup ArgumentParser
cmd_line_parser = argparse.ArgumentParser(description="Adabot utility for updating circuitpython.org libraries info.",
prog="Adabot circuitpython.org/libraries Updater")
cmd_line_parser.add_argument("-o", "--output_file", help="Output JSON file to the filename provided.",
metavar="<OUTPUT FILENAME>", dest="output_file")
cmd_line_parser = argparse.ArgumentParser(
description="Adabot utility for updating circuitpython.org libraries info.",
prog="Adabot circuitpython.org/libraries Updater"
)
cmd_line_parser.add_argument(
"-o", "--output_file",
help="Output JSON file to the filename provided.",
metavar="<OUTPUT FILENAME>",
dest="output_file"
)

def is_new_or_updated(repo):
""" Check the repo for new release(s) within the last week. Then determine
Expand All @@ -55,20 +61,26 @@ def is_new_or_updated(repo):
if "published_at" not in release_info:
return
else:
release_date = datetime.datetime.strptime(release_info["published_at"], "%Y-%m-%dT%H:%M:%SZ")
release_date = datetime.datetime.strptime(
release_info["published_at"],
"%Y-%m-%dT%H:%M:%SZ"
)
if release_date < today_minus_seven:
return

# we have a release within the last 7 days. now check if its a newly released library
# within the last week, or if its just an update
# we have a release within the last 7 days. now check if its a newly
# released library within the last week, or if its just an update
result = github.get("/repos/adafruit/" + repo["name"] + "/releases")
if not result.ok:
return

new_releases = 0
releases = result.json()
for release in releases:
release_date = datetime.datetime.strptime(release["published_at"], "%Y-%m-%dT%H:%M:%SZ")
release_date = datetime.datetime.strptime(
release["published_at"],
"%Y-%m-%dT%H:%M:%SZ"
)
if not release_date < today_minus_seven:
new_releases += 1

Expand All @@ -83,7 +95,8 @@ def get_open_issues_and_prs(repo):
open_issues = []
open_pull_requests = []
params = {"state":"open"}
result = github.get("/repos/adafruit/" + repo["name"] + "/issues", params=params)
result = github.get("/repos/adafruit/" + repo["name"] + "/issues",
params=params)
if not result.ok:
return [], []

Expand All @@ -101,7 +114,8 @@ def get_contributors(repo):
reviewers = []
merged_pr_count = 0
params = {"state":"closed", "sort":"updated", "direction":"desc"}
result = github.get("/repos/adafruit/" + repo["name"] + "/pulls", params=params)
result = github.get("/repos/adafruit/" + repo["name"] + "/pulls",
params=params)
if result.ok:
today_minus_seven = datetime.datetime.today() - datetime.timedelta(days=7)
prs = result.json()
Expand All @@ -110,7 +124,8 @@ def get_contributors(repo):
if "merged_at" in pr:
if pr["merged_at"] is None:
continue
merged_at = datetime.datetime.strptime(pr["merged_at"], "%Y-%m-%dT%H:%M:%SZ")
merged_at = datetime.datetime.strptime(pr["merged_at"],
"%Y-%m-%dT%H:%M:%SZ")
else:
continue
if merged_at < today_minus_seven:
Expand All @@ -137,10 +152,12 @@ def update_json_file(working_directory, cp_org_dir, output_filename, json_string
""" Clone the circuitpython-org repo, update libraries.json, and push the updates
in a commit.
"""
if "TRAIVS" in os.environ:
if "TRAVIS" in os.environ:
if not os.path.isdir(cp_org_dir):
os.makedirs(cp_org_dir, exist_ok=True)
git_url = "https://" + os.environ["ADABOT_GITHUB_ACCESS_TOKEN"] + "@github.com/adafruit/circuitpython-org.git"
git_url = ("https://"
+ os.environ["ADABOT_GITHUB_ACCESS_TOKEN"]
+ "@github.com/adafruit/circuitpython-org.git")
git.clone("-o", "adafruit", git_url, cp_org_dir)
os.chdir(cp_org_dir)
git.pull()
Expand Down Expand Up @@ -184,7 +201,9 @@ def update_json_file(working_directory, cp_org_dir, output_filename, json_string
working_directory = os.path.abspath(os.getcwd())
cp_org_dir = os.path.join(working_directory, ".cp_org")

startup_message = ["Run Date: {}".format(run_time.strftime("%d %B %Y, %I:%M%p"))]
startup_message = [
"Run Date: {}".format(run_time.strftime("%d %B %Y, %I:%M%p"))
]

output_filename = os.path.join(cp_org_dir, "_data/libraries.json")
local_file_output = False
Expand All @@ -206,13 +225,21 @@ def update_json_file(working_directory, cp_org_dir, output_filename, json_string
merged_pr_count_total = 0
repos_by_error = {}

default_validators = [vals[1] for vals in inspect.getmembers(cpy_vals.library_validator) if vals[0].startswith("validate")]
default_validators = [
vals[1] for vals in inspect.getmembers(cpy_vals.library_validator)
if vals[0].startswith("validate")
]
bundle_submodules = common_funcs.get_bundle_submodules()
validator = cpy_vals.library_validator(default_validators, bundle_submodules, 0.0)
validator = cpy_vals.library_validator(
default_validators,
bundle_submodules,
0.0
)

for repo in repos:
if repo["name"] in cpy_vals.BUNDLE_IGNORE_LIST or repo["name"] == "circuitpython":
continue
if (repo["name"] in cpy_vals.BUNDLE_IGNORE_LIST
or repo["name"] == "circuitpython"):
continue
repo_name = repo["name"]

# get a list of new & updated libraries for the last week
Expand Down Expand Up @@ -252,7 +279,9 @@ def update_json_file(working_directory, cp_org_dir, output_filename, json_string
else:
if error[0] not in repos_by_error:
repos_by_error[error[0]] = []
repos_by_error[error[0]].append("{0} ({1} days)".format(repo["html_url"], error[1]))
repos_by_error[error[0]].append(
"{0} ({1} days)".format(repo["html_url"], error[1])
)

# sort all of the items alphabetically
sorted_new_list = {}
Expand Down