Fix templates

Author: stefanv

devstats/reports/index.md

@@ -24,7 +24,7 @@ A snapshot of the development on the {{ project }} project.
 query_date = np.datetime64("2020-01-01 00:00:00")
 
 # Load data
-with open("{{ project }}_issues.json", "r") as fh:
+with open("devstats-data/{{ project }}_issues.json", "r") as fh:
     issues = [item["node"] for item in json.loads(fh.read())]
 
 glue("devstats-data/{{ project }}_query_date", str(query_date.astype("M8[D]")))
@@ -48,12 +48,36 @@ glue("devstats-data/{{ project }}_query_date", str(query_date.astype("M8[D]")))
 ---
 tags: [hide-input]
 ---
-with open("devstats-data/{{ project }}_prs.json", "r") as fh:
+with open("devstats-data/{{ project }}_PRs.json", "r") as fh:
     prs = [item["node"] for item in json.loads(fh.read())]
-```
-
-```{include} prs_filter.md
 
+# Filters
+
+# The following filters are applied to the PRs for the following analysis:
+#
+# - Only PRs to the default development branch (e.g `main`)[^master_to_main]
+#  are considered.
+# - Only PRs from users with _active_ GitHub accounts are considered. For example,
+#   if a user opened a Pull Request in 2016, but then deleted their GitHub account
+#   in 2017, then this PR is excluded from the analysis.
+# - PRs opened by dependabot are excluded.
+
+# Only look at PRs to the main development branch - ignore backports,
+# gh-pages, etc.
+default_branches = {"main", "master"}  # Account for default branch update
+prs = [pr for pr in prs if pr["baseRefName"] in default_branches]
+
+# Drop data where PR author is unknown (e.g. github account no longer exists)
+prs = [pr for pr in prs if pr["author"]]  # Failed author query results in None
+
+# Filter out PRs by bots
+bot_filter = {
+  "dependabot-preview",
+  "github-actions",
+  "meeseeksmachine",
+  "pre-commit-ci[bot]"
+}
+prs = [pr for pr in prs if pr["author"]["login"] not in bot_filter]
 ```
 
 ```{include} prs_merged_over_time.md

devstats/reports/issues.md

@@ -42,7 +42,7 @@ is {glue:text}`{{ project }}_new_issue_median_lifetime`.
 query_date = np.datetime64("2020-01-01 00:00:00")
 
 # Load data
-with open("../devstats-data/{{ project }}_issues.json", "r") as fh:
+with open("devstats-data/{{ project }}_issues.json", "r") as fh:
     issues = [item["node"] for item in json.loads(fh.read())]
 
 glue("{{ project }}_query_date", str(query_date.astype("M8[D]")))

devstats/reports/new_issues.md

@@ -1,4 +1,4 @@
-```{code-cell} ipython3
+```{code-cell}
 ---
 tags: [remove-cell]
 ---
@@ -25,7 +25,7 @@ warnings.filterwarnings(
 )
 ```
 
-```{code-cell} ipython3
+```{code-cell}
 ---
 tags: [remove-cell]
 ---