Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ Alternatively, set this template as an upstream branch and merge in changes acco
3. *Merge changes* (maybe do this on a branch other than main and make a PR into main): `git merge template/main -- allow-unrelated-histories` (for the main branch in the upstream template).
4. *Fix Merge Conflicts*: Fix the merge conflicts in your local branch.

However, both of these methods are messy (at least the first time), since the package name (`python_template`) changes, and (if the derived repo is created from the gitHub template) the merge will want to revert it back to `python_template` and put anything new into a `python_template` directory as well (since they don't have a shared history).
However, both of these methods are messy (seemingly every time, though much worse the first time), since the package name (`python_template`) changes, and (if the derived repo is created from the gitHub template) the merge will want to revert it back to `python_template` and put anything new into a `python_template` directory as well (since they don't have a shared history).

The possible way to avoid this is if the derived repo is created locally as a copy of this repo, since then they'll have a shared history (and then the flag `--allow-unrelated-histories` in step 3 can be omitted as well).
6 changes: 4 additions & 2 deletions tests/test_logger/test_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from datetime import datetime
from pathlib import Path

from python_template import settings
from python_template.logger import LoggerMixin
from python_template.logger.logger import DebugCategoryNameFilter

Expand All @@ -23,8 +24,9 @@ def test_logger(capsys, test_class):
out, _ = capsys.readouterr()
using_key_text = "Using logger_key:"
existing_key_text = "Existing keys in _loggers:"
assert using_key_text in out
assert existing_key_text in out
if settings.debug_prints:
assert using_key_text in out
assert existing_key_text in out


def test_custom_logger(create_custom_test_class):
Expand Down