Commit graph

1162 commits

Author SHA1 Message Date
Jrnl Bot
6e5d43ca78 Increment version to v2.5.1-alpha 2020-11-28 22:49:08 +00:00
Jonathan Wren
c3a8453e94
remove http-basic config for poetry (shouldn't be used anymore) 2020-11-28 14:40:54 -08:00
Jrnl Bot
68e72958b8 Update changelog [ci skip] 2020-11-28 21:22:48 +00:00
Jonathan Wren
45f051f51a
Add fix for changelog conditional always returning false (#1101) 2020-11-28 13:21:16 -08:00
Jonathan Wren
4cad215560
Add a release workflow for PyPI in CI (Github Actions) (#1095)
* Fixes for new CI pipeline (Github Actions)

- Support ci skip tag on commits to avoid build dupes
- Add smarter path detection so we don't spam tons of tests
- Allow steps to cancel if previous steps were cancelled (don't always
  run)
- Separate workflows to be more modular
- Update release workflow to do a few more things
- Add helpful messages
- Be more strict in version checking (now with added regex)
- Make changelog smarter about when to trigger
- Add some functionality for changelog to handle releases and
  prereleases separately
- Better error handling
- Split up the version validation and the release to make way for more
  releases

* add step in workflow to merge to release branch after a release

* add check for git diff so commit doesn't error out constantly
2020-11-28 11:50:13 -08:00
Jrnl Bot
e9d909a3ba Update changelog 2020-11-25 20:35:40 +00:00
Jonathan Wren
4b2645cbae
Update build badge in readme to point at github instead of travis (#1094) 2020-11-25 12:33:38 -08:00
Jrnl Bot
e3aa088fa7 Update changelog 2020-11-22 00:06:47 +00:00
Jonathan Wren
6da3b6dc01
stop changelog update from triggering subsequent ci builds 2020-11-21 16:04:26 -08:00
Jrnl Bot
7f06e11d7a Update changelog 2020-11-21 23:53:06 +00:00
Jonathan Wren
f07774e351
update changelog generator setting to include PRs, and use bot's token 2020-11-21 15:51:10 -08:00
Jrnl Bot
3ad9e37d31 Update changelog 2020-11-21 23:42:08 +00:00
Micah Jerome Ellison
b511461cfa
Fix Unicode encoding failure in directory export when creating filenames from journal titles with certain characters (#1090)
Fix Unicode encoding failure in directory export when creating filenames from journal titles with certain characters
2020-11-21 15:41:08 -08:00
Jrnl Bot
046ebc7514 Update changelog 2020-11-21 23:21:21 +00:00
Jonathan Wren
cfdd05358a
Add ability to put --edit partly through a cli entry to move it to the editor (#1091)
also add some functionality to test suite to see what the editor file contents were and make assertions about it
2020-11-21 15:20:21 -08:00
Jrnl Bot
336936651f Update changelog 2020-11-21 23:19:54 +00:00
Jrnl Bot
09cd77e8dc
Update changelog 2020-11-21 15:18:25 -08:00
Jonathan Wren
d68b9e1ca1
More changelog fixes (#1092)
* add bot token since gh actions doesn't allow pushing to protected branch
* add a max for issues, since we keep getting rate limited
* add jrnl bot username to commit step
* change token for git repo
2020-11-21 15:11:58 -08:00
Jonathan Wren
142e6f597e
Changelog fixes (#1088)
* typo fix

* clean up changelog to match version tags
2020-11-21 11:47:30 -08:00
Jonathan Wren
514ee309b8
Add logo to readme (#1085)
* add logo to readme

* update url for image

* rename file to be more clear about where it goes
2020-11-21 11:22:54 -08:00
Jonathan Wren
e23c4b78b5
Add changelog generation workflow to github actions (#1086)
* Add changelog workflow to github actions, remove old script

This basically takes the exact script, and turns it into a workflow. The
only difference is that the new workflow doesn't detect a release build
like the script did (releases will be a separate workflow).

* remove old config file for changelog generator (it's in workflow now)

* whitespace change

* remove ableist language
2020-11-21 11:21:19 -08:00
Jonathan Wren
8ec661b8a3
get rid of travis and circle configs (in favor of github actions) (#1082)
* get rid of travis and circle configs (in favor of github actions)

* also remove gitlab
2020-11-14 13:54:37 -08:00
Jonathan Wren
616e33d2b4
Make changelog auto exclude stale and wontfix issues (#1081) 2020-11-14 13:15:06 -08:00
Micah Jerome Ellison
e75fa75e65
Wording update on CHANGELOG.md [ci-skip] 2020-11-14 12:56:13 -08:00
Jrnl Bot
96de70704d
Update changelog [ci skip] 2020-11-14 12:42:38 -08:00
Jonathan Wren
4d97110183
Add initial config for Github Actions (#1078)
* Add initial config to test github actions

* remove other CI configs so PR doesn't get bogged down

* add poetry

* skip failing test, update behave output

* add multiple python versions

* add test cache

* try to use matrix for python version

* try to cache pip installation

* add other OSes

* whitespace changes

* skip failing test on windows

* add pip cache

* take out pip cache

* clean up, add linting steps

* add release branch to testing

* clean up

* add initial a11y config for docs site

* take out junit for now

* add junit annotations

* try different junit reporter

* add junit annotations into same workflow

* linter fix

* make junit step always run

* more junit

* clean up

* disable a11y exit code for now (always pass)

* put back travis and circle so we can temporarily run everything in tandem

* fix for issues with secret tokens
2020-11-14 12:42:36 -08:00
Micah Jerome Ellison
a52f46949e
Add PyPI classifiers (#1074) 2020-11-14 12:42:35 -08:00
Micah Jerome Ellison
c38c39efee
Update dependencies - pyxdg, pytest, black (#1076)
* Update version pin on pyxdg and run poetry update
* Update pytest pin and rerun poetry update
* Update black pin to latest version, poetry update, and make format
2020-11-14 12:42:34 -08:00
Jrnl Bot
7a465eabeb
Update changelog [ci skip] 2020-11-14 12:42:31 -08:00
Jrnl Bot
99555c41b5 Increment version to v2.5 2020-11-07 19:34:57 +00:00
Jonathan Wren
b2fc1dcce8
Add mac tests to Circle CI config (#1070) 2020-11-07 11:28:07 -08:00
Micah Jerome Ellison
f25b672a0e
Add note about --debug in bug/support GitHub templates (#1069) 2020-11-06 16:19:36 -08:00
Jrnl Bot
975e4ba7e2 Update changelog [ci skip] 2020-11-01 00:50:24 +00:00
Jonathan Wren
57de3b7d81
Add initial a11y config for docs site (#1067) 2020-10-31 13:59:38 -07:00
Jrnl Bot
b0b98d85fe Update changelog [ci skip] 2020-10-28 20:02:54 +00:00
Jonathan Wren
9e72d10c4c
Add circle ci config file for linux tests (#1063)
* Add circle ci config file for linux tests
* Moved repeated commands into commands section for reuse in jobs
  Circle apparently allows you to separate custom commands into their own
  key, and then reuse them at will in jobs.
* move conditions into individual commands
2020-10-28 12:37:18 -07:00
Jrnl Bot
66d03d133f Update changelog [ci skip] 2020-10-24 23:06:55 +00:00
Micah Jerome Ellison
5b029e6117
Documentation updates (#1032)
* Applying doc changes based on reviews of past several documentation PRs
* Update docs
  Clean up encryption docs
  Clean up security docs
  Delete export.md
  Make new formats.md and add to sidebar. Also add all of the built-in formats, and examples for each.
  Update mkdocs config for new files

* Fix broken docs links
* Correct incomplete sentences and markdown formatting issues
* Make overview a little more concise
* Update some command line arguments to latest version and make it a bit more concise
* Clean up unneeded TOML modifications and other scaffolding not needed for 3.9
* Revert "Clean up unneeded TOML modifications and other scaffolding not needed for 3.9"
  This reverts commit 13b4266ed1.
* Specify that brew is also the easiest way to install jrnl on Linux
* Update docs/security.md
* Update docs/recipes.md
* Doc updates:
- Remove import/export page, fold it into formats
- Rename security to privacy-and-security.md to avoid conflation w/ github security issues
- Various small cleanup and edits from PR review

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2020-10-24 15:41:58 -07:00
Jrnl Bot
4ee4f388f4 Update changelog [ci skip] 2020-10-18 03:00:49 +00:00
Jonathan Wren
748ad738e2
update changelog generator config to include closed issues 2020-10-17 19:30:18 -07:00
Jrnl Bot
4de3606084 Update changelog [ci skip] 2020-10-18 02:25:36 +00:00
joaquin garmendia
8c2de0e6d7
Add display format option to config file. (#1050)
* Add display format option to config file.
* Add tests.
* Fix `black` error.
* Change nested if to top level.
2020-10-17 18:53:34 -07:00
Micah Jerome Ellison
05d0a0cc83 Fix version number test failing on lack of patch version after change to 2.5 2020-10-17 15:38:06 -07:00
Jrnl Bot
93bcd9bdfe Increment version to v2.5-beta 2020-10-17 22:23:55 +00:00
Jonathan Wren
d916f66dbf
[WIP] Lots of test refactoring (#1042)
* make behave slightly less verbose for use with behave --format progress2
* standardize behave tests
* move tests around to be more behavior driven
* clean up txt file after tests
* add more tests, add more functionality to behave for calling mock editor
* move around behave tests, get rid of regression files
* clean up some code around keyrings
* add more placeholder test scenarios (marked with @todo)
  You can run just these tests with `behave --no-skipped --tags=todo`
* fix "missing_directory" test
  This test was missing the config file it was trying to use. So, it was
  really a very useless, broken test that we absolutely should not have
  approved the PR (#963) for.
* add write tests for each journal type
* update version tests, add new regex match behave step
* add config test outlines
* add journal types to some search tests
* change "basic" config reference to "simple"
* update configs
* add more journal types in search
* fix basic folder journal reference
* add flush output steps to behave, update delete flag tests
* fix failing test with a flush
* update more delete flag tests to include other journal types
* fix file cleanup after failed test with no debug on
* fix password test
* fix DayOne tag sample data, move search/format tag tests, and run them on multiple jrnl types
* added ability to auto-prompt for password for encrypted journals
  Only uses password when prompted, and doesn't get in the way of other
  input prompts. This allows us to run the same scenarios on both
  encrypted journals and other journal types.
* fold encrypted scenarios into the rest of the scenarios where possible
* remove apostrophe that is breaking tests on CI
* add more journal type tests to import feature
* standardize whitespace in behave tests, take out duplicate test
* update handling of cache directories in test suite (easier syntax)
* skip failing YAML exporter emoji test on Windows
* added @todo tags for things that need follow-up

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-10-17 15:17:38 -07:00
Jrnl Bot
b76a1c43da Update changelog [ci skip] 2020-10-11 00:58:55 +00:00
micahellison
ebba342779
Add support for Python 3.9 and fix 3.9 build (#1054)
* Support Python 3.9 release in build instead of using 3.9 beta
* Revert Linux and Mac 3.9 definitions since release versions are not working on either
* Run poetry update
* Try out Python 3.10 support on all platforms with allow_failures on
* Adding c:\Python310 path reference for Python 3.10 Windows build
* Clean up unnecessary TOML modification in 3.9 build and always upgrade pyenv in Mac builds
* Clean up unnecessary before_install step on Mac and change 3.9-dev->3.9 definition on Linux
* Reverting Linux Python version to 3.9-dev so that it will run
2020-10-10 17:33:08 -07:00
Jrnl Bot
169e62f1b0 Update changelog [ci skip] 2020-10-10 22:14:23 +00:00
Jonathan Wren
171ce3428d
Disable logging by default (#1053)
* disable logging by default (only enabled if --debug flag is given)

* Run make format

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2020-10-10 14:56:13 -07:00
Jrnl Bot
d20ce3d383 Update changelog [ci skip] 2020-09-11 20:15:44 +00:00