Merge pull request #205 from bennuttall/patch-1

Add piwheels stats

Author: evaherrada

adabot/circuitpython_libraries.py

@@ -293,8 +293,8 @@ def run_library_checks(validators, bundle_submodules, latest_pylint, kw_args, er
     print_issue_overview(blinka_insights)
     output_handler("* {} open issues".format(len(blinka_insights["open_issues"])))
     output_handler("  * https://github.com/adafruit/Adafruit_Blinka/issues")
-    blinka_dl, _ = dl_stats.pypistats_get('adafruit-blinka')
-    output_handler("* PyPI Downloads in the last week: {}".format(blinka_dl))
+    blinka_dl = dl_stats.piwheels_stats().get('adafruit-blinka', {}).get("month", "N/A")
+    output_handler("* Piwheels Downloads in the last month: {}".format(blinka_dl))
     output_handler(
         "Number of supported boards: {}".format(blinka_funcs.board_count())
     )

adabot/circuitpython_library_download_stats.py

@@ -49,45 +49,42 @@
 # i.e. are not named 'Adafruit_CircuitPython_'.
 PYPI_FORCE_NON_CIRCUITPYTHON = ["Adafruit-Blinka"]
 
+# https://www.piwheels.org/json.html
+PIWHEELS_PACKAGES_URL = "https://www.piwheels.org/packages.json"
 
-def pypistats_get(repo_name):
-    # get download stats for the last week
-    api_url = "https://pypistats.org/api/packages/" + repo_name + "/recent"
-    pypi_stats_last_week = requests.get(api_url, timeout=30)
-    if not pypi_stats_last_week.ok:
-        # return "Failed to retrieve data ({})".format(pypi_stats.text)
-        return None, None
-    pypi_dl_last_week = pypi_stats_last_week.json()["data"]["last_week"]
-
-    # get total download stats
-    pypi_dl_total = 0
-    api_url = "https://pypistats.org/api/packages/" + repo_name + "/overall?mirrors=false"
-    pypi_stats_total = requests.get(api_url, timeout=30)
-    if pypi_stats_total.ok:
-        for data in pypi_stats_total.json()["data"]:
-            pypi_dl_total += data["downloads"]
-
-    return pypi_dl_last_week, pypi_dl_total
+
+def piwheels_stats():
+    stats = {}
+    response = requests.get(PIWHEELS_PACKAGES_URL)
+    if response.ok:
+        packages = response.json()
+        stats = {
+            pkg: {"total": dl_all, "month": dl_month}
+            for pkg, dl_month, dl_all, *_ in packages if pkg.startswith("adafruit")
+        }
+
+    return stats
 
 def get_pypi_stats():
     successful_stats = {}
     failed_stats = []
     repos = common_funcs.list_repos()
+    dl_stats = piwheels_stats()
     for repo in repos:
         if (repo["owner"]["login"] == "adafruit" and repo["name"].startswith("Adafruit_CircuitPython")):
             if common_funcs.repo_is_on_pypi(repo):
-                pypi_dl_last_week, pypi_dl_total = pypistats_get(repo["name"].replace("_", "-").lower())
-                if pypi_dl_last_week is None:
+                pkg_name = repo["name"].replace("_", "-").lower()
+                if pkg_name in dl_stats:
+                    successful_stats[repo["name"]] = (dl_stats[pkg_name]["month"], dl_stats[pkg_name]["total"])
+                else:
                     failed_stats.append(repo["name"])
-                    continue
-                successful_stats[repo["name"]] = (pypi_dl_last_week, pypi_dl_total)
 
     for lib in PYPI_FORCE_NON_CIRCUITPYTHON:
-        pypi_dl_last_week, pypi_dl_total = pypistats_get(lib.lower())
-        if pypi_dl_last_week is None:
-            failed_stats.append(lib)
-            continue
-        successful_stats[lib] = (pypi_dl_last_week, pypi_dl_total)
+        pkg_name = lib.lower()
+        if pkg_name in dl_stats:
+            successful_stats[lib] = (dl_stats[pkg_name]["month"], dl_stats[pkg_name]["total"])
+        else:
+            failed_stats.append(repo["name"])
 
     return successful_stats, failed_stats
 
@@ -142,9 +139,9 @@ def run_stat_check():
 
     pypi_downloads = {}
     pypi_failures = []
-    downloads_list = [["| Library", "| Last Week", "| Total |"],
+    downloads_list = [["| Library", "| Last Month", "| Total |"],
                       ["|:-------", "|:--------:", "|:-----:|"]]
-    output_handler("Adafruit CircuitPython Library PyPi downloads:")
+    output_handler("Adafruit CircuitPython Library Piwheels downloads:")
     output_handler()
     pypi_downloads, pypi_failures = get_pypi_stats()
     for stat in sorted(pypi_downloads.items(), key=operator.itemgetter(1,1), reverse=True):