Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor --template code #1711

Merged
merged 17 commits into from
May 20, 2023
Merged

Conversation

micahellison
Copy link
Member

@micahellison micahellison commented Mar 25, 2023

Fixes #1736 and #1737.

Re-organizes some of the template code from #1667. Moving template concerns out of controller.py where possible.

Checklist

  • I have read the contributing doc.
  • I have included a link to the relevant issue number.
  • I have checked to ensure there aren't other open pull requests
    for the same issue.
  • I have written new tests for these changes, as needed.

@micahellison
Copy link
Member Author

In an attempt to fix this, I removed the Path return values in favor of strings. I like that it's more consistent with the rest of the code base (though I do like pathlib in theory), however the tests are still failing.

It looks like the problem is that the current directory is needed for os.path.abspath to work, but it somehow doesn't exist while running unit tests on Linux. I'm not sure what's going on there.

@micahellison micahellison changed the title [WIP] Refactor --template code Refactor --template code May 1, 2023
@micahellison micahellison marked this pull request as ready for review May 1, 2023 23:38
@micahellison micahellison linked an issue May 20, 2023 that may be closed by this pull request
Copy link
Member

@wren wren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

@wren wren merged commit 4a7057c into jrnl-org:develop May 20, 2023
@wren wren added the bug Something isn't working label May 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
2 participants