Commit graph

28 commits

Author SHA1 Message Date
Jonathan Wren
e57a51ba25 Upgrade license to GPLv3 (#918)
The MIT license is a bit outdated, and doesn't provide the protections
we'd like in a modern open-source application.

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-04-18 13:31:25 -07:00
Jonathan Wren
a03445bb84 add pyflakes to dev deps, run pyflakes in CI 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
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
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
Jrnl Bot
d4a0895163 Updating changelog [ci skip] 2020-04-10 16:18:34 -07:00
Jrnl Bot
edc49cf5a2 Incrementing version to v2.3.1-beta [ci skip] 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
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
Jonathan Wren
480b881bda Put back build lines in poetry config (#838)
Taking out these lines earlier fixed the homebrew release, but broke
other things. So, I'm putting them back for now until we can find a
better solution.
2020-04-10 11:51:56 -07:00
Jrnl Bot
252ab7256b Incrementing version to v2.2.1-beta2 [ci skip]
Update changelog
2020-04-10 11:51:56 -07:00
Jonathan Wren
f83f486659 Take out build system from pyproject config #781
We don't use it, and it breaks the homebrew install.
2020-04-10 11:51:56 -07:00
Jrnl Bot
4d0a73dab2 Incrementing version to v2.2 [ci skip]
Update changelog
2020-04-10 11:51:56 -07:00
Jrnl Bot
c3d5878a31 Incrementing version to v2.2-beta2 [ci skip]
Update changelog
2020-04-10 11:51:56 -07:00
Jonathan Wren
416fe4d208 update poetry version 2020-04-10 11:51:56 -07:00
Jonathan Wren
5de0027f3b add maintainer field to config 2020-04-10 11:51:56 -07:00
Jonathan Wren
9a354a95d0 fix poetry warning 2020-04-10 11:51:56 -07:00
Jonathan Wren
ca2a0e53c2 update black version 2020-04-10 11:51:56 -07:00
Jrnl Bot
35432f8c70 Incrementing version to v2.1.1 2020-04-10 11:51:56 -07:00
Jrnl Bot
fc4fd803d6 Incrementing version to v2.1.1-beta 2020-04-10 11:51:55 -07:00
MinchinWeb
70c946bc13 [Travis] add testing on Windows and Mac
See #739 (Python 3.8), #619 (Windows)
Appease the Travis gods
[Travis] no auto-ruby
[Travis] include a test in not UTC
see #742
[Travis] Add Python to PATH on Windows
[Travis] Windows: try Python 3.7 for cryptography wheels?
[Travis] Windows tests time out
2020-04-10 11:51:55 -07:00
Peter Schmidbauer
3080d501f2 Clarify currently supported Python versions
The Python 3.8 build currently fails on travis, this should be dealt with in a future PR along with updating the travis config and pyproject.toml
2020-04-10 11:51:55 -07:00
Jrnl Bot
182b5cd35f Incrementing version to v2.1.post2 2020-04-10 11:51:55 -07:00
Jrnl Bot
83974b7aa7 Incrementing version to v2.1-beta6 2020-04-10 11:51:55 -07:00
Jonathan Wren
f7953fdd61 ¯\_(ツ)_/¯
[#681] Update version handling in source and travis deployments
[#681] Appease the poetry gods
[#681] Separate local dev from pipeline releases
[#681] take out automated pages deployment (for now), since it broke the
site
2020-04-10 11:51:55 -07:00
Jonathan Wren
8c0c95d1f6 Poetry updates
update version and author emails
update makefile to use poetry for more things
remove faulty conditional
2020-04-10 11:51:55 -07:00
Jonathan Wren
0ea24da225 update requirements to include pyyaml >= 5.1 2020-04-10 11:51:55 -07:00
Manuel Ebert
a61658d453 Add Poetry config
Add deployment through poetry to travis
2020-04-10 11:51:55 -07:00