Commit graph

896 commits

Author SHA1 Message Date
jess
6198604045 Add Open Collective information to README (#916)
* Added financial contributors to the README
2020-04-18 12:35:46 -07:00
Jrnl Bot
b29314f6bc Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
MinchinWeb
587de366fb Update Windows Python versions (#910)
* [Travis] update Windows Python versions
* Update Python versions to be uniform across the board

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-04-18 12:35:46 -07:00
Jrnl Bot
9a56cc8a09 Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
Jonathan Wren
a5450b21cd fix import issues (from pyflakes merge) 2020-04-18 12:35:46 -07:00
MinchinWeb
68ad5c0c1a Ensure exported entries end in a newline for Markdown and YAML exporters (#908)
* [Markdown Exporter] [YAML Exporter] Ensure exported entires end in a newline

Fixes #768, Fixes #881.

If the exported entry does not have a final empty line, this will add one on export. Some Markdown parsers get picky about not having a empty line above a heading....

* fix black formatting issues
* explicitly sort filenames

to deal with inconsistent default file ordering on different OS's
* Update .gitignore
* Update test for typo fix

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-04-18 12:35:46 -07:00
Jrnl Bot
62ea1e2b23 Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
Jonathan Wren
a03445bb84 add pyflakes to dev deps, run pyflakes in CI 2020-04-18 12:35:46 -07:00
Jonathan Wren
e3a46e9846 fix various small issues in the codebase 2020-04-18 12:35:46 -07:00
Jrnl Bot
abad3a3a79 Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
Micah Jerome Ellison
8d49a9770d Update keyring version from "^19.0" to ">19.0, <22.0" (#914)
* #783 Allow keyring >19.0, <22.0 instead of ^19.0
2020-04-18 12:35:46 -07:00
Jrnl Bot
4eb5fe375a Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
Jonathan Wren
50d582ef73 Update the code of conduct (#913) 2020-04-18 12:35:46 -07:00
MinchinWeb
42bebd5632 Test Version match (#887)
* [Tests] makes sure `--version` works
Directly reads the version number from pyproject.toml

* Tag the tests
To run just this test, use `behave --tags=deployments_tests`
2020-04-18 12:35:46 -07:00
Jrnl Bot
bd6bee47b8 Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
MinchinWeb
4fed54576c [DayOne] support moderm plistlib (#909)
The API of the standard library's `plistlib` changed with version 3.4 of Python, and the old API is being removed in Python 3.9. In other words, the new API is supported by all version of Python we current support (3.6 to 3.8).

See https://docs.python.org/3.4/library/plistlib.html for more details.
2020-04-18 12:35:46 -07:00
Jrnl Bot
86f5e8e243 Updating changelog [ci skip] 2020-04-18 12:35:46 -07:00
MinchinWeb
65045cc332 [YAML Exporter] fix starred spelling (#907)
* fix starred spelling
c.f. #835
2020-04-18 12:35:46 -07:00
Jrnl Bot
7016c6925b Updating changelog [ci skip] 2020-04-10 16:18:34 -07:00
Jonathan Wren
333dbca783 Update twitter buttons, contribution in footer (#905) 2020-04-10 16:18:34 -07:00
Micah Jerome Ellison
79d2bd5ec7 Change install doc guideline from pip to pipx and mention minimum Python version 2020-04-10 16:18:34 -07:00
Micah Jerome Ellison
42e22950b1 Allow tzlocal version >1.5 <3.0 instead of >1.5 <2.0 (#900)
* Allow tzlocal version >1.5 instead of ^1.5 (#883)
* Change tzlocal version restriction to <3.0
2020-04-10 16:18:34 -07:00
notbalanced
aece970751 Properly display entries during a tag search. (#902) 2020-04-10 16:18:34 -07:00
Jrnl Bot
f57dcf5cab Updating changelog [ci skip] 2020-04-10 16:18:34 -07:00
Jonathan Wren
d3d3ef4c3e Update Poetry requirements for testing latest Python version (#898)
Poetry errors out if we try to run a different version of Python that
what is specified in the config file. We want to run tests against the
latest Python version so we can see problems before they happen. This
fix updates the config file so Poetry will allow us to test. Nothing is
committed after the update.
2020-04-10 16:18:34 -07:00
Jrnl Bot
c49e028dea Updating changelog [ci skip] 2020-04-10 16:18:34 -07:00
Jonathan Wren
0e1f415c97 Fix failing tests and linting issues 2020-04-10 16:18:34 -07:00
dbxnr
65a3b2ce7c Fix for upgrade with missing journal (#796)
* Fix for upgrade with missing journal
* add test, refactor solution
* add missing test config

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-04-10 16:18:34 -07:00
dbxnr
15429d4f61 Interactive delete (#850)
* fixup alichtman's implementation
* cleanup imports

Co-authored-by: Aaron Lichtman <aaronlichtman@gmail.com>
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-04-10 16:18:34 -07:00
Aaron Lichtman
f4fca3e5a4 Add --delete for interactive removal of entries (#698)
* Add --delete for interactive removal of entries
* Add inquirer dependency for fancy prompting
* Fix some minor style issues
* Fix #434 
* Use PyInquirer instead of inquirer for Windows compatibility
* Add WIP (broken) test
* Change deletion interface to be more basic
* Update environment.py

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-04-10 16:18:34 -07:00
Jrnl Bot
d4a0895163 Updating changelog [ci skip] 2020-04-10 16:18:34 -07:00
Jonathan Wren
87d0c84757 Hotfix for keeping the version in sync in code (testing to come later) (#895)
hotfix for keeping the version in sync in code (testing to come later)
2020-04-10 11:51:56 -07:00
Jrnl Bot
edc49cf5a2 Incrementing version to v2.3.1-beta [ci skip] 2020-04-10 11:51:56 -07:00
Jrnl Bot
ff8a0c3f16 Updating changelog [ci skip] 2020-04-10 11:51:56 -07:00
MinchinWeb
59624a4941 Syntax fix (#886)
SyntaxWarning: "is" with a literal. Did you mean "=="?

This works otherwise due to an implementation quirk of cPython.
2020-04-10 11:51:56 -07:00
Micah Jerome Ellison
7a328d0fe3 Update and reorganize CONTRIBUTING (#885)
* Include information about branching strategy
* Re-organize documentation and include information on testing
* Use gerund form in Contributing headlines
* Fix markdown links and expand developing documentation
* Add pipx link and explain test code structure
* Include pull request process in CONTRIBUTING
* Update CONTRIBUTING with small changes from PR review
* Mention failing tests in CONTRIBUTING
* Add information for developers about issue labels
2020-04-10 11:51:56 -07:00
Jonathan Wren
aae55aa193 Update Travis caching to speed up builds (#871) 2020-04-10 11:51:56 -07:00
Jonathan Wren
0471402183 Create FUNDING.yml (#861)
Test out using Github sponsors
2020-04-10 11:51:56 -07:00
Jrnl Bot
bc35c356a9 Incrementing version to v2.3 [ci skip] 2020-04-10 11:51:56 -07:00
Jrnl Bot
3a72ea4af1 Updating changelog [ci skip] 2020-04-10 11:51:56 -07:00
Nathan Genetzky
327af80997 docs: Update url for "beautiful timeline" in export.md (#879)
The previous URL was invalid. Used way back time machine, and at least at some point a redirect was setup to this site.
2020-04-10 11:51:56 -07:00
Jonathan Wren
2a4f5ca5c9 fix up remnants of merge conflicts 2020-04-10 11:51:56 -07:00
Jrnl Bot
507914ff3c Updating changelog [ci skip] 2020-04-10 11:51:56 -07:00
Jonathan Wren
cd437e8c8f Update stalebot emoji to 📌 instead of
The pushpin better reflects the functionality (stops the issue from
staling).
2020-04-10 11:51:56 -07:00
Jonathan Wren
302d353c4d Fix up tests and related issues
Upgrade poetry if already installed
Get rid of test function that was causing windows problems
2020-04-10 11:51:56 -07:00
Aaron Lichtman
9e5d160bbd Pretty print journal entries (#692)
* Pretty print journal entry titles and dates.

Changes appearance of all jrnl viewing commands, such as $ jrnl --short and
$ jrnl -n {NUM}.

Fix #508

* Removed extra newline at end of title

* Use ansiwrap to properly wrap strings with ANSI escapes

* Add ansiwrap to pyproject.toml

* Allow configuration of colors

- Replaced raw escapes with colorama
- Added colors key to config
- Add checks for validity of color values

* Add color configuration documentation

* Fix broken tests due to config change

* Add tests for colors in configs

- Identifying invalid color configs
- Upgrading config from no colors -> colors

* Add colorama dependency for all platforms

* Allow users to disable colorization of output

* Update poetry.lock

* Add tag and body color customization options

* Fix colorization of tags in title and body

* Updated tests to use no color by default

* Change pass to continue in verify_config()

* Better style in Entry.py

* Reduce code duplication for tag highlighting

- Breaks "unreadable date" regression test for unknown reason

* Properly colorize tags and print body

* Reformatting and clean up

* Replace list comprehension with generator

* Handle invalid colors by not using a color

* Process ANSI escapes properly with behave

* Fixed the 'spaces after tags directly next to punctuation' bug

Broke processing of tags next to any punctuation at all

* Closer to working tag colorization but not perfect

* Add tests printing for multiline journals

Fix #717

* Correctly indent first line of multiline entry

* Add test for multiline entries with tags

* Remove redundant UNICODE flag

* Progress towards proper tag colorization and body formatting

* Fix newline colorization bug

Debug code left intact since there are more bugs to fix :/

* And now the space just ends up before the tag instead of after it

* Fix assertion syntax warning

* Moved tag test to tagging.feature file

* Strip out debug code and clean up

* Bold datetimes in title

* Bold all titles

Fix #720

* Remove PY2 and PY3 constants

* Fix regression in features/steps/core.py

* Fix tag_regex

* Remove redundant re.UNICODE flag

* Remove extraneous code
2020-04-10 11:51:56 -07:00
Micah Jerome Ellison
6985de2844 Add support to save journals to multiple files in a directory
Update FolderJournal reference to entry __unicode__ method to __str__
Remove DayOne test made obsolete by FolderJournal
Fix FolderJournal path tests for Windows paths
Apply Black linting
2020-04-10 11:51:56 -07:00
Craig Moyer
a3c81d46fe Add support for folder base journal.
Adds feature for issue #170 (and #398) where you configure your journal to
be a directory and entries are added as sub-directories and files:
yyyy/mm/dd.txt. Multiple entries in a day will go in the same file, but a
new entry for a specific day will create a new file (and directory
structure).

Fix failed test scenarios for folder journal.
2020-04-10 11:51:56 -07:00
Manuel Ebert
a3afa112ab Clean up shortcut for Limit
This piece of code has bothered me for more than 6 years! (See #131) - this moves parsing arguments to where it belongs.
2020-04-10 11:51:56 -07:00
Aurélien Ooms
1b3d2961a1 docs: Fix fish history instructions.
Use `--add` flag in fish `abbr` command.
2020-04-10 11:51:56 -07:00