Commit graph

1902 commits

Author SHA1 Message Date
renovate[bot]
f5e5d817be
Update dependency requests to v2.30.0 (#1728)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-20 15:22:31 -07:00
renovate[bot]
d5f00edb9d
Update dependency rich to v13.3.5 (#1729)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-20 15:20:51 -07:00
renovate[bot]
6e9fade8dd
Update dependency tox to v4.5.1 (#1727)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-20 15:19:30 -07:00
Jrnl Bot
7045e97a24 Update changelog [ci skip] 2023-05-20 22:17:51 +00:00
renovate[bot]
fdc87ff8c4
Update dependency mkdocs to v1.4.3 (#1733)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-20 15:15:42 -07:00
Jrnl Bot
81313c2445 Update changelog [ci skip] 2023-05-20 22:12:36 +00:00
renovate[bot]
0b8b4244bd
Update dependency poethepoet to v0.20.0 (#1735)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-20 15:10:16 -07:00
Jrnl Bot
7a8b86aadb Update changelog [ci skip] 2023-05-20 22:10:01 +00:00
renovate[bot]
1f59c15f5e
Update dependency pytest-xdist to v3.3.1 (#1740)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-20 15:07:47 -07:00
renovate[bot]
da0c49da83
Update dependency tzlocal to v5 (#1741)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-05-20 15:07:06 -07:00
Micah Jerome Ellison
8f2eb27793
Add flakeheaven_cache/ to gitignore and fix typo in comment (#1731) 2023-05-20 14:57:24 -07:00
Jonathan Wren
a1a68f7eea
clean up changelog a bit 2023-05-20 14:50:41 -07:00
Jrnl Bot
cd850c068d Update changelog [ci skip] 2023-05-20 20:37:30 +00:00
Jrnl Bot
e987e34c78 Increment version to v4.0 2023-05-20 20:35:57 +00:00
Jrnl Bot
53342c944e Update changelog [ci skip] 2023-05-07 00:04:57 +00:00
Jonathan Wren
0b55c477e1
Lock ruamel.yaml version until bug is fixed (#1738) 2023-05-06 17:02:55 -07:00
Jrnl Bot
7e09c4eb66 Update changelog [ci skip] 2023-04-29 22:53:16 +00:00
Jrnl Bot
adeb1acced Increment version to v4.0-beta3 2023-04-29 22:51:01 +00:00
Micah Jerome Ellison
95836a7dd1
Only read text files that look like entries when opening folder journal (#1697)
* Add text file that should be ignored to basic test folder journal. Makes tons of tests fail
* Add additional files that should be ignored by FolderJournal
* Ignore all files in folder journal except year/month/day.txt
* Completely remake get_files in FolderJournal:
- move get_files into FolderJournal class and add underscore prefix
- create iterables to get for year/month folders and day files
- make year/month/day file reading strict: only exact expected months and days out of all possible months and days
* Restore accidentally-deleted self.sort() line
* Use match instead of string comparison to be os-agnostic
* Explicitly declare static methods
* Filter with glob first for max performance
* Explicitly check for valid dates in FolderJournal and add unit test
* Remove unneeded jrnl import
* Clean up method comment and add type hints
* Add is_valid_date unit test
* Elucidate comment

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2023-04-29 15:49:41 -07:00
Jrnl Bot
88aa2491b0 Update changelog [ci skip] 2023-04-29 18:59:52 +00:00
CoffeeOrDeath
73aa146f8a
Update contributing.md links in documentation (#1726)
* Chore: Update README.md to contribution

Update the contribution link to go directly to the current contribution guide and documentation.

* Update PULL_REQUEST_TEMPLATE.md
2023-04-29 11:57:57 -07:00
Jrnl Bot
7d237c887f Update changelog [ci skip] 2023-04-22 20:49:03 +00:00
Jrnl Bot
8d95e0bfe9 Increment version to v4.0-beta2 2023-04-22 20:46:35 +00:00
Jrnl Bot
bd147fa285 Update changelog [ci skip] 2023-04-22 20:40:18 +00:00
renovate[bot]
ab9128ffb6
Update dependency tox to v4.4.12 (#1712)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-22 13:38:15 -07:00
Jrnl Bot
d2c92511ff Update changelog [ci skip] 2023-04-22 20:37:56 +00:00
renovate[bot]
9bd16473c9
Update dependency rich to v13.3.4 (#1713)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-22 13:35:27 -07:00
renovate[bot]
ad3b8396be
Update dependency flake8-type-checking to v2.4.0 (#1714)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-22 13:34:15 -07:00
Jrnl Bot
8a22f9db56 Update changelog [ci skip] 2023-04-22 20:33:52 +00:00
renovate[bot]
b00f5f1531
Update dependency black to v23.3.0 (#1715)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-22 13:31:16 -07:00
Jrnl Bot
fc83bee80b Update changelog [ci skip] 2023-04-22 20:21:49 +00:00
Zhizhen He
0b64d50f4b
fix typo (#1718) 2023-04-22 13:19:15 -07:00
Jrnl Bot
ea6a5da3eb Update changelog [ci skip] 2023-04-22 19:41:20 +00:00
renovate[bot]
5bcdcdd5c6
Update dependency pytest to v7.3.1 (#1720)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-22 12:39:25 -07:00
renovate[bot]
9581b1b81a
Update dependency flakeheaven to v3.3.0 (#1722)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-22 12:37:48 -07:00
Jrnl Bot
10216988d4 Update changelog [ci skip] 2023-04-22 19:32:57 +00:00
renovate[bot]
745373df6a
Update dependency cryptography to v40.0.2 (#1723)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-04-22 12:30:17 -07:00
Jrnl Bot
23551a379b Update changelog [ci skip] 2023-03-25 23:06:24 +00:00
Jrnl Bot
deef870213 Increment version to v4.0-beta 2023-03-25 23:04:23 +00:00
Jrnl Bot
37b731ff14 Update changelog [ci skip] 2023-03-25 19:34:32 +00:00
Jonathan Wren
3c923ae943
Allow combinations of --change-time, --delete, and --edit while correctly counting the number of entries affected (#1669)
* Remove search mode conditional that added explicit tag search behavior
* Fix failing change-time test by using same method signature as base journal class
* Fix user input mock - was not appropriately checking return value
* Clean up controller
  - streamline `run` function in `controller.py`
  - add debug logging
  - fix unnecessary import of Journal class (only needed for typing)
  - standardize summary display across different actions
* Add currently-failing test conditions for count messages when changing time and deleting
* Don't show summary if no entries found and prevent extra line break when no entries found by short-circuiting display method
* Track found entry count and remove incorrect modified stat logic
* Track journal entry deletion consistently
* Remove unneeded exception when editor is empty and fix test that was testing incorrect message
* Correct entry edit modified count test
* Track modification of entries with --change-time
* Preserve existing behavior when editor is empty but make the message more clear
* Reconcile tests with new error message when clearing editor in edit mode
* Add found/modified counts to edit tests
* Add tests for found count with -n equivalent argument
* Test combinations of found/deleted messages when using --delete
* Add tests for counting combinations of action arguments (change-time, edit, delete) and for change-time counts. Some are failing and should be investigated
* Remove extraneous comment in test
* Track added/deleted counts in a register in the Journal class instead of attempting to infer it via controller counting
* Add encrypted to more tests
* Fix merge conflict typo
* Change 'write mode' -> 'append mode' in more places

---------

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2023-03-25 12:32:25 -07:00
Jrnl Bot
b3c6f90a35 Update changelog [ci skip] 2023-03-25 18:49:16 +00:00
Aaron Lichtman
a2b217fdfc
Add ability to use template with --template (#1667)
* Add ability to pass template path with --template

Update jrnl/args.py

* Fix tests
2023-03-25 11:47:00 -07:00
Jrnl Bot
0725ea6b87 Update changelog [ci skip] 2023-03-25 18:18:19 +00:00
renovate[bot]
dad2744e71
Update dependency cryptography to v40 (#1710)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-03-25 11:15:48 -07:00
Jrnl Bot
94f079293b Update changelog [ci skip] 2023-03-25 17:55:18 +00:00
renovate[bot]
55f7328b3e
Update dependency poethepoet to v0.19.0 (#1709)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-03-25 10:53:19 -07:00
Jrnl Bot
5a74b0e722 Update changelog [ci skip] 2023-03-18 20:00:55 +00:00
renovate[bot]
3764946dfe
Update dependency pytest-xdist to v3.2.1 (#1705)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-03-18 12:58:47 -07:00
renovate[bot]
1b7afe588b
Update dependency ipdb to v0.13.13 (#1703)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-03-18 12:57:47 -07:00