Commit graph

1156 commits

Author SHA1 Message Date
Felix Yan
c9f76e595e
Correct typos in CONTRIBUTING.md (#1040) 2020-09-05 10:53:10 -07:00
Jrnl Bot
5cb8ea2886 Update changelog [ci skip] 2020-08-22 19:32:36 +00:00
Jonathan Wren
29234ddc35
Documentation updates (Thanks @guydebros!) (#1031)
* updated README.md:

- corrected information about encryption
- made additions based on proposed changes to overview.md
- made other changes for clarity and grammar

* ongoing changes to overview.md

* added note that `pycrypto` is required

made other small changes for grammar and clarity

* added new python decryption script to encryption.md

* updated encryption.md to clarify dependencies

other relatively small changes for clarity

straightened quotes

Co-authored-by: Guy B. deBros <guydebros@users.noreply.github.com>
2020-08-22 12:13:36 -07:00
Jrnl Bot
c381d56630 Update changelog [ci skip] 2020-08-22 18:58:37 +00:00
Jonathan Wren
631e08a557
Clean up help screen, get rid of util.py (#1027)
* More refactoring of cli.py

break up code from cli.py (now in jrnl.py) up into smaller functions
get rid of export mode
move --encrypt and --decrypt to commands.py
clean up the help screen even more
update flag name for import

* reorganize code, move around lots of functions

* clean up import statements

* move run function out of cli and into jrnl

* rename confusingly named function

* move editor function into editor file

* rename parse_args.py to args.py to make room for more args functions

* Fix error in test suite for windows

I accidentally flipped the conditional, so this fixes it.

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>

* Update app description on help screen

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-08-22 11:40:39 -07:00
Jrnl Bot
7c3abb2625 Update changelog [ci skip] 2020-08-18 01:08:18 +00:00
micahellison
3c7dcbadbe
Add support for Python 3.9 build testing (#1018)
* First stab at adding Python 3.9 dev Travis builds
* Dynamically replace Python max version for Python 3.9 beta builds
* Fix allow_failures (3.9-dev, not 3.9) and fix Windows find-and-replace command to allow 3.9
* Fix allow_failures to allow all three Python 3.9 builds to fail
* Use platform-independent Python script to allow all Python versions for 3.9 builds
* Format changes and changing before_install to script for 3.9 builds
* Install toml module to make it possible to run version-changing script before install
* Properly populate before_install step with Mac and Windows Python 3.9, and remove extraneous unused python key
* Add refreshenv to get python3 path included in WIndows
* Ensure MacOS pyenv is up to date and attempt to reference Windows python3 directly
* Use bash-friendly paths in Windows and check to see exactly what the Python 3.9 executable is
* Confirm Python version in Windows and attempt to get pip a different way
* Fiddling with Windows python references
* Remove Python3.6 references and check for Python directory in root directory
* Add Python 3.9 path to Windows build
* Remove pip steps that should be unnecessary
* Add upgrade pip to Windows Python 3.9 build
* Attempt to resolve "access denied" error when upgrading pip on Windows
* Use allow_all_python_version TOML script in nightly build instead of sed
2020-08-17 17:46:13 -07:00
Jrnl Bot
6f71c98e13 Update changelog [ci skip] 2020-08-08 19:01:17 +00:00
Jonathan Wren
40a7fcdbeb
Update github issue templates to use new diagnostic command (#1022) 2020-08-08 11:46:16 -07:00
Dacoda Nelson
5eaf94a18f
Updated advanced.md in docs to reflect all four subkeys under colors in the config files. (#1023) 2020-08-08 11:44:50 -07:00
Jonathan Wren
32429933f9 clean up linting issue 2020-08-01 15:54:13 -07:00
Jonathan Wren
971deb387b update python deprecation message 2020-08-01 15:54:13 -07:00
Jonathan Wren
5455158ea0 remove python 3.6 from dependencies 2020-08-01 15:54:13 -07:00
Jonathan Wren
c64a17e97c disable python 3.6 tests 2020-08-01 15:54:13 -07:00
Jonathan Wren
2553c1244d fix typo in test 2020-08-01 15:54:13 -07:00
Jonathan Wren
6b1ac328fd Fix small bug related to starring an entry with a date
If a date was given with an entry, and the star was also was added, the
star wouldn't be recognized if it was at the start of the title.

Example that didn't work, but now works with this fix:
  jrnl "saturday: *Title words."

This is to be consistent in starring functionality with and without a
date in the entry.
2020-08-01 15:54:13 -07:00
Jonathan Wren
bfd1cf5eb8 Fix small bug related to starring an entry with a date
If a date was given with an entry, and the star was also was added, the
star wouldn't be recognized if it was at the start of the title.

Example that didn't work, but now works with this fix:
  jrnl "saturday: *Title words."

This is to be consistent in starring functionality with and without a
date in the entry.
2020-08-01 15:54:13 -07:00
Jonathan Wren
a54ed90259 Move import to be standalone command to reduce clutter in cli.py 2020-08-01 15:54:13 -07:00
Jonathan Wren
ce07fedc06 quick clean of arg parsing function by using default param 2020-08-01 15:54:13 -07:00
Jonathan Wren
3e22bf9292 Move journal_name out of cli and into separate function
It's now part of args, and it's parsed into a function after the config
is available
2020-08-01 15:54:13 -07:00
Jonathan Wren
4fb6263212 short isn't a filter 2020-08-01 15:54:13 -07:00
Jonathan Wren
526867bcdd small code cleanup 2020-08-01 15:54:13 -07:00
Jonathan Wren
66e23d1444 change default logging level so deprecation warnings don't spam users 2020-08-01 15:54:13 -07:00
Jonathan Wren
626a18a6ec Update more arg parsing options and handling 2020-08-01 15:54:13 -07:00
Jonathan Wren
fb184c5f5e Move standalone commands into their own file
Also, cleaned up the way the arg parser handles standalone commands.
Rather than checking individually for each command, you can now register
the command in the proper place, and it will be run with all known
arguments (and cofig if available).
2020-08-01 15:54:13 -07:00
Jonathan Wren
5922ca41ee Update arg parsing to better handle optinal journal name
Fixes #520 -and parameter seems to only work for the default journal
2020-08-01 15:54:13 -07:00
Jonathan Wren
2b2f24449f update tests 2020-08-01 15:54:13 -07:00
Jrnl Bot
0e083ad600 Update changelog [ci skip] 2020-08-01 22:12:20 +00:00
micahellison
64a31e301d
Resolve Travis/Windows/pip issues with upgrade to cryptography 3.0 (#1016)
* add missing dependency
* update cryptography dependency
* Installing poetry with pipx instead of pip
* Fix bad pipx install command
* Remove pipx commands and attempt to solve issue through poetry configuration
* Fix pip install command to include --upgrade as before

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-08-01 14:58:45 -07:00
Jrnl Bot
0a74fe9cef Update changelog [ci skip] 2020-07-31 16:56:22 +00:00
Jrnl Bot
888981c11e Increment version to v2.4.5 2020-07-31 16:39:22 +00:00
Jonathan Wren
832b9229f3
Add missing packaging dependency (#1011) 2020-07-29 15:22:49 -07:00
Jrnl Bot
b509af6798
Increment version to v2.4.4 2020-07-25 16:35:04 -07:00
Jrnl Bot
b2187269d1
Update changelog [ci skip] 2020-07-25 16:34:19 -07:00
Jonathan Wren
40a40af952
Fix readthedocs.io build process (#1004)
* fix readthedocs.io build process
2020-07-25 16:34:17 -07:00
Jrnl Bot
982aad0a16
Update changelog [ci skip] 2020-07-25 16:34:16 -07:00
Jrnl Bot
99e2f7bab8
Increment version to v2.4.4-beta 2020-07-25 16:34:09 -07:00
Jrnl Bot
14bcb2c1af Update changelog [ci skip] 2020-07-18 20:03:04 +00:00
Jonathan Wren
a11aa24c7e Allow editing of DayOne entries (#1001)
* add test to repro issue #955

* Allow editing of DayOne entries

* Add broken test for Dayone

Add test for editing Dayone entries (this test currently fails)

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>

* Fix editing logic for DayOneJournal

DayOneJournal previously reimplemented Journal._parse inside of
DayOneJournal.parse_editable_string, and in doing so caused issues
between itself and the class it was inheriting from. This commit fixes
the issue by moving the UUID to be in the body of the entry, rather than
above it. So, then Journal._parse still finds the correct boundaries
between entries, and DayOneJournal then parses the UUID afterward.

Co-authored-by: MinchinWeb <w_minchin@hotmail.com>
Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-07-18 12:54:52 -07:00
Jrnl Bot
4c2f2861db Update changelog [ci skip] 2020-07-18 19:17:27 +00:00
Jonathan Wren
6abee8e9d6 fix readme link to submit an issue (#1002) 2020-07-18 12:08:34 -07:00
MinchinWeb
78aa2548ac Update documentation.md (#1003)
Hoping to make the language more positive.
2020-07-17 18:42:45 -07:00
Jrnl Bot
0702e6f2b6 Update changelog [ci skip] 2020-07-12 23:32:19 +00:00
Micah Jerome Ellison
4ca6e3f95f Display warning if Python version is less than 3.7 (#994)
* Add Python version check and faulty test to confirm it's working (should fail on 3.6 build only)
* Apply formatting
* Fix behave Python version test
* Make error message more descriptive and friendly
2020-07-12 16:24:46 -07:00
Jrnl Bot
686fc0cfdf Update changelog [ci skip] 2020-07-11 17:45:37 +00:00
Jonathan Wren
c9fc298317 Add new documentation issue type to github templates (#1000) 2020-07-11 10:34:52 -07:00
Micah Jerome Ellison
f7a49d715e Make behave output more concise when running make test (#988)
Make behave output more concise when running make test

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-06-27 17:51:31 -07:00
Jrnl Bot
89624c155b Update changelog [ci skip] 2020-06-20 21:38:19 +00:00
Micah Jerome Ellison
8d702fee9d Add unit testing via pytest (#987)
* Add pytest to project

Includes a couple sample tests, a note in CONTRIBUTING, and inclusion in the makefile

* Include pytest in Travis build
2020-06-20 14:30:15 -07:00
Jrnl Bot
e4f1453cc9 Update changelog [ci skip] 2020-06-20 21:18:17 +00:00