Switch back to .githubactivity.json

This project is written in Python, but it can be used with any GitHub repo, so shouldn't rely on pyproject.toml

Author: manics

github_activity/cli.py

@@ -1,15 +1,10 @@
 import argparse
+import json
 import os
 import sys
 from subprocess import PIPE
 from subprocess import run
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-
-
 from .git import _git_installed_check
 from .github_activity import _parse_target
 from .github_activity import generate_activity_md
@@ -146,19 +141,13 @@
 
 def load_config_and_defaults(args):
     """
-    Load github-activity config from pyproject.toml if it exists,
-    override unset args with values from pyproject.toml,
+    Load .githubactivity.json from the current directory,
+    override unset args with values from .githubactivity.json,
     and set defaults for remaining args.
-
-    args: An argparse namespace object containing the parsed arguments.
-      Fields which are None will be replaced with the configuration from
-      pyproject.toml, or a default if not set.
-      The args object is modified in place.
     """
     try:
-        with open("pyproject.toml", "rb") as f:
-            pyproject = tomllib.load(f)
-            config = pyproject.get("tool", {}).get("github-activity", {})
+        with open(".githubactivity.json") as f:
+            config = json.load(f)
     except FileNotFoundError:
         config = {}
 

requirements.txt

@@ -3,5 +3,4 @@ numpy
 pandas
 python-dateutil
 requests
-tomli >= 1.1.0 ; python_version < "3.11"
 tqdm

tests/resources/cli_no_target-pyproject.toml

@@ -0,0 +1,3 @@
+{
+  "heading-level": 5
+}

tests/resources/cli_no_target.githubactivity.json

@@ -45,7 +45,7 @@ def test_cli(tmpdir, file_regression, cmd, basename):
     file_regression.check(md, basename=basename, extension=".md")
 
 
-def test_cli_pyproject_config(tmp_path, monkeypatch, file_regression):
+def test_cli_dot_config(tmp_path, monkeypatch, file_regression):
     """Test that pyproject.toml config is loaded"""
     cmd = "github-activity -s 2019-09-01 -u 2019-11-01 -o {path_output}"
     basename = "cli_no_target_pyproject"
@@ -56,8 +56,8 @@ def test_cli_pyproject_config(tmp_path, monkeypatch, file_regression):
     shutil.copytree(str(repo_dir), str(tmp_path), dirs_exist_ok=True)
     monkeypatch.chdir(tmp_path)
     shutil.copyfile(
-        repo_dir / "tests" / "resources" / "cli_no_target-pyproject.toml",
-        "pyproject.toml",
+        repo_dir / "tests" / "resources" / "cli_no_target.githubactivity.json",
+        ".githubactivity.json",
     )
 
     command = cmd.format(path_output=path_output)