diff --git a/.cruft.json b/.cruft.json index 40691bb..b1c202b 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/OpenAstronomy/packaging-guide", - "commit": "cb394c68be7c573ddcfaeeea54757c72555eedd0", + "commit": "67566adb59d47f3a778e6f122f8fa60148fdcdec", "checkout": null, "context": { "cookiecutter": { @@ -25,7 +25,7 @@ ".github/workflows/sub_package_update.yml" ], "_template": "https://github.com/OpenAstronomy/packaging-guide", - "_commit": "cb394c68be7c573ddcfaeeea54757c72555eedd0" + "_commit": "67566adb59d47f3a778e6f122f8fa60148fdcdec" } }, "directory": null diff --git a/pyproject.toml.rej b/pyproject.toml.rej new file mode 100644 index 0000000..dbbd95e --- /dev/null +++ b/pyproject.toml.rej @@ -0,0 +1,18 @@ +diff a/pyproject.toml b/pyproject.toml (rejected hunks) +@@ -24,7 +24,7 @@ open_astronomy_package_template_example = "ripplemapper.example_mod:main" + test = [ + "pytest", + "pytest-doctestplus", +- "pytest-cov" ++ "pytest-cov", + ] + docs = [ + "sphinx", +@@ -49,6 +49,7 @@ testpaths = [ + doctest_plus = "enabled" + text_file_format = "rst" + addopts = "--doctest-rst" ++norecursedirs = ["ripplemapper[\\/]_dev"] + + [tool.coverage.run] + omit = [