Commit graph

1396 commits

Author SHA1 Message Date
Micah Jerome Ellison
cd865e048e
Add --co alias for --config-override (#1397) 2022-02-05 13:04:23 -08:00
Jrnl Bot
f890e2fcd3 Update changelog [ci skip] 2022-02-05 21:01:00 +00:00
Micah Jerome Ellison
972af21bca
Add reference documentation to docs site and separate out "Tips and Tricks" and "External Editors" from "Recipes" (#1332)
* First draft of command line reference, mostly pulled from help screen

* Add first draft of config file reference, mostly pulled from advanced.md

* Clean up config file doc for readability

* Add --config-file and remove examples from CLI reference

* Add warning about time zone in timeformat

* More small changes, and adding template config keyword

* Cleaning up and re-ordering config file reference

* Clean up reference and anything else from advanced documentation that can live elsewhere and linking to config file reference wherever config file is mentioned

* Fix syntax highlighting in command line reference, clean up content a bit, include --diagnostic

* Mention version config key

* Apply minor changes suggested in PR review

* Rename "recipes" to "Tips and Tricks", pull "External Editors" out of it into its own page, and redirect old recipes link to tips-and-tricks

* Revert broken mkdocs-redirects usage from last commit
2022-02-05 12:59:20 -08:00
Jrnl Bot
967ec86d9d Update changelog [ci skip] 2022-02-05 20:05:36 +00:00
dependabot[bot]
a8f0b18219
Bump black from 21.12b0 to 22.1.0 (#1404)
* Bump black from 21.12b0 to 22.1.0

Bumps [black](https://github.com/psf/black) from 21.12b0 to 22.1.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits/22.1.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* Run make format

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2022-02-05 12:04:06 -08:00
Jrnl Bot
0773d6b1d3 Update changelog [ci skip] 2022-02-05 19:45:38 +00:00
dependabot[bot]
b1e228ea40
Bump asteval from 0.9.25 to 0.9.26 (#1400)
Bumps [asteval](https://github.com/newville/asteval) from 0.9.25 to 0.9.26.
- [Release notes](https://github.com/newville/asteval/releases)
- [Commits](https://github.com/newville/asteval/compare/0.9.25...0.9.26)

---
updated-dependencies:
- dependency-name: asteval
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-05 11:44:06 -08:00
Jrnl Bot
5463476a00 Update changelog [ci skip] 2022-01-22 18:17:22 +00:00
dependabot[bot]
aa2c77abfc
Bump ipython from 7.28.0 to 7.31.1 (#1401)
Bumps [ipython](https://github.com/ipython/ipython) from 7.28.0 to 7.31.1.
- [Release notes](https://github.com/ipython/ipython/releases)
- [Commits](https://github.com/ipython/ipython/compare/7.28.0...7.31.1)

---
updated-dependencies:
- dependency-name: ipython
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-22 10:15:36 -08:00
Jonathan Wren
1fbb788528
Unskip some tests (#1399)
* remove skip_editor test and tag

* remove useless test

* unskip blank input test

* formatting

* rename test so it doesn't overwrite other test

* unskip some dayone tests that now work
2022-01-15 14:45:00 -08:00
Jrnl Bot
49930e16f7 Update changelog [ci skip] 2022-01-15 20:14:21 +00:00
dependabot[bot]
5555557cec
Bump cryptography from 36.0.0 to 36.0.1 (#1389)
Bumps [cryptography](https://github.com/pyca/cryptography) from 36.0.0 to 36.0.1.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/36.0.0...36.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-15 12:12:39 -08:00
Jrnl Bot
d0921fb7b6 Update changelog [ci skip] 2022-01-08 22:52:46 +00:00
Jonathan Wren
e7f24527c3
Fix styling on documentation sidebar (#1395)
* fix sidebar stling in docs theme

* don't display heading levels higher than 3 in sidebar

* update sitemap step for easier debugging

* add matrix so github doesn't get confused
2022-01-08 14:51:02 -08:00
Jrnl Bot
c4c60efab2 Update changelog [ci skip] 2022-01-08 20:44:40 +00:00
dependabot[bot]
bf757bdc90
Bump keyring from 23.4.0 to 23.5.0 (#1392)
Bumps [keyring](https://github.com/jaraco/keyring) from 23.4.0 to 23.5.0.
- [Release notes](https://github.com/jaraco/keyring/releases)
- [Changelog](https://github.com/jaraco/keyring/blob/main/CHANGES.rst)
- [Commits](https://github.com/jaraco/keyring/compare/v23.4.0...v23.5.0)

---
updated-dependencies:
- dependency-name: keyring
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-08 12:43:09 -08:00
Jrnl Bot
256aab9877 Update changelog [ci skip] 2022-01-08 20:38:48 +00:00
Micah Jerome Ellison
3b0c7992d2
Add weekly Saturday morning build and prevent Python 3.11 from running on PRs (#1387)
* Add weekly Saturday morning build and prevent Python 3.11 from running on PRs
* Fix extraneous greater than symbol
* Add branches and paths to cron schedule
* Add back missing hyphen before cron
* Trying to fix YAML syntax error
* Remove branches and paths from schedule
* Fix invalid conditional, push 3.11 check down to actual tests like we did with 3.10
* Separate out PR tests and scheduled tests
* Fix YAML syntax
* Fix uses action reference
* Use proper action folder structure
* Check out repo before running local action
* Specify bash shell and remove unneeded if
* Specify shell for each run statement
* Move secret out of composite action since it is not supported directly
* Fix half-fixed previous commit
* Remove extraneous ./
* Fix pathing and name steps
* take out shell key from action
* put back missing git config line in workflows

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
2022-01-08 12:36:58 -08:00
Jrnl Bot
bb0d96a005 Update changelog [ci skip] 2021-12-11 20:41:46 +00:00
Jrnl Bot
2244f1ff77 Increment version to v2.8.4-beta1 2021-12-11 20:40:10 +00:00
Jrnl Bot
28b6126853 Update changelog [ci skip] 2021-12-11 20:37:19 +00:00
Jonathan Wren
2ab485de8c
Improve handling of mocking logic in pytest (#1382)
* WIP

* fix handling of user input (stdin, input, getpass)

* take out redundant pytest step

* fix handling of 'we should' statements

* fix test that doesn't use a config file

* fix another test that uses stdin

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

* remove .tool-versions file per PR feedback

* add comment to clarify why disembodied variables are here

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2021-12-11 12:35:32 -08:00
dependabot[bot]
3518e37087
Bump black from 21.11b1 to 21.12b0 (#1384)
Bumps [black](https://github.com/psf/black) from 21.11b1 to 21.12b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-11 12:02:30 -08:00
dependabot[bot]
e9e75ea36b
Bump keyring from 23.3.0 to 23.4.0 (#1383)
Bumps [keyring](https://github.com/jaraco/keyring) from 23.3.0 to 23.4.0.
- [Release notes](https://github.com/jaraco/keyring/releases)
- [Changelog](https://github.com/jaraco/keyring/blob/main/CHANGES.rst)
- [Commits](https://github.com/jaraco/keyring/compare/v23.3.0...v23.4.0)

---
updated-dependencies:
- dependency-name: keyring
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-11 12:02:20 -08:00
Jrnl Bot
4552936e89 Update changelog [ci skip] 2021-12-11 19:57:33 +00:00
dependabot[bot]
bf0a4e0d1a
Bump yq from 2.12.2 to 2.13.0 (#1385)
Bumps [yq](https://github.com/kislyuk/yq) from 2.12.2 to 2.13.0.
- [Release notes](https://github.com/kislyuk/yq/releases)
- [Changelog](https://github.com/kislyuk/yq/blob/develop/Changes.rst)
- [Commits](https://github.com/kislyuk/yq/compare/v2.12.2...v2.13.0)

---
updated-dependencies:
- dependency-name: yq
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-12-11 11:55:55 -08:00
Jrnl Bot
ba8a59b26f Update changelog [ci skip] 2021-11-27 19:52:07 +00:00
dependabot[bot]
a3aeb38611
Bump cryptography from 35.0.0 to 36.0.0 (#1379)
Bumps [cryptography](https://github.com/pyca/cryptography) from 35.0.0 to 36.0.0.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/35.0.0...36.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-27 11:49:27 -08:00
dependabot[bot]
9e99a2ea96
Bump keyring from 23.2.1 to 23.3.0 (#1381)
Bumps [keyring](https://github.com/jaraco/keyring) from 23.2.1 to 23.3.0.
- [Release notes](https://github.com/jaraco/keyring/releases)
- [Changelog](https://github.com/jaraco/keyring/blob/main/CHANGES.rst)
- [Commits](https://github.com/jaraco/keyring/compare/v23.2.1...v23.3.0)

---
updated-dependencies:
- dependency-name: keyring
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-27 11:47:51 -08:00
Jrnl Bot
882721f859 Update changelog [ci skip] 2021-11-20 19:58:26 +00:00
dependabot[bot]
03940ad598
Bump black from 21.10b0 to 21.11b1 (#1375)
Bumps [black](https://github.com/psf/black) from 21.10b0 to 21.11b1.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-20 11:56:41 -08:00
Jrnl Bot
a1f6d78e04 Update changelog [ci skip] 2021-11-20 19:49:53 +00:00
Piero Lescano
ba3fd2202f
Add added option to _print_edited_summary (#1366)
* Add added option to _print_edited_summary

* Add tests for counts of entries added, modified, and deleted

* Add test for modifying an entry rather than replacing it

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2021-11-20 11:47:56 -08:00
Jrnl Bot
ffc8bdd5f1 Update changelog [ci skip] 2021-11-13 22:54:50 +00:00
Micah Jerome Ellison
5e45f305ac
Use full Python version for GitHub Actions cache key (#1373) 2021-11-13 14:52:42 -08:00
dependabot[bot]
55dd9484c9
Bump mkdocs from 1.1 to 1.2.3 in /docs_theme (#1360)
Bumps [mkdocs](https://github.com/mkdocs/mkdocs) from 1.1 to 1.2.3.
- [Release notes](https://github.com/mkdocs/mkdocs/releases)
- [Commits](https://github.com/mkdocs/mkdocs/compare/1.1...1.2.3)

---
updated-dependencies:
- dependency-name: mkdocs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-13 11:48:27 -08:00
Jrnl Bot
bbfa32a115 Update changelog [ci skip] 2021-11-06 21:27:23 +00:00
Jrnl Bot
7a70bbc51e Increment version to v2.8.4-beta 2021-11-06 21:25:54 +00:00
Jrnl Bot
93d59edb67 Update changelog [ci skip] 2021-11-06 21:19:41 +00:00
Micah Jerome Ellison
06ee6db7e7
Use Python 3.10 stable in CI (#1362)
* Remove special case code needed for Python 3.10 pre-release and try to get Python 3.11 pre-release running on CI
* Wrap 3.10 in quotes so it doesn't resolve to 3.1
* Remove pflake --version call that is crashing in Python 3.11-dev
* Run poetry update and restore removed flake8 line
2021-11-06 14:18:00 -07:00
Jrnl Bot
a354b13139 Update changelog [ci skip] 2021-11-06 21:14:16 +00:00
samuelgregorovic
ae009099ed
Add --config-file argument to use alternate config file at runtime (#1290)
* added new CLI argument option --config-file

* pass argument and fetch alt config file if specified

* argparse argument setting update

* argument alias --cf added

* documentation update - usage of CLI argument

* fixed name-clash + unit tests

* feature test added

* #1170-alternate-config-file: Auto stash before rebase of "refs/heads/#1170-alternate-config-file"

* Update docs/advanced.md

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

* BDD tests added

* Begin migrating/rewording --cf tests in pytest-bdd.

Uses current directory instead of deep directory structure, but requires a given for each config file referenced

* Fix issue where specifying a config-file that needs to be upgraded ended up upgrading the user config file instead

* Uncomment and rework remaining tests for pytest-bdd instead of behave

* Fix copytree for Python 3.7 (which doesn't support dirs_exist_ok)

* Minor fixes to alternative config examples

* Remove behave tests (behave is no longer in use)

* Move config file unit test to unit test dir and use pytext path fixture instead of current directory to find test data

* Use explicit "given the config exists" for copying config files instead of shoehorning in "given we use the config" twice

* Change when/when to when/and

* Clarify scenarios and fix indentation

* Confirm primary config file isn't modified when encrypting/decrypting a journal in an alternate config file

* Remove try/except on copytree since I'm no longer using the same

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
2021-11-06 14:12:34 -07:00
Jrnl Bot
5057c290c1 Update changelog [ci skip] 2021-11-06 20:39:19 +00:00
dependabot[bot]
e242aa4ced
Bump pytest-bdd from 4.1.0 to 5.0.0 (#1368)
Bumps [pytest-bdd](https://github.com/pytest-dev/pytest-bdd) from 4.1.0 to 5.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-bdd/releases)
- [Changelog](https://github.com/pytest-dev/pytest-bdd/blob/master/CHANGES.rst)
- [Commits](https://github.com/pytest-dev/pytest-bdd/compare/4.1.0...5.0.0)

---
updated-dependencies:
- dependency-name: pytest-bdd
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-06 13:37:54 -07:00
Jrnl Bot
e082156779 Update changelog [ci skip] 2021-11-06 20:32:07 +00:00
Ben Beasley
99c19b2a64
Support pytest-bdd 5.x (#1365)
https://github.com/pytest-dev/pytest-bdd/blob/5.0.0/README.rst#migration-of-your-tests-from-versions-4xx
2021-11-06 13:30:25 -07:00
Jrnl Bot
f608e176c1 Update changelog [ci skip] 2021-11-06 20:26:39 +00:00
dependabot[bot]
8cabf0f87a
Bump black from 21.9b0 to 21.10b0 (#1370)
Bumps [black](https://github.com/psf/black) from 21.9b0 to 21.10b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-06 13:24:50 -07:00
Jrnl Bot
b4ccf44d3a Update changelog [ci skip] 2021-10-23 19:19:39 +00:00
Fabian Affolter
c68c13ab6e
Switch to poetry-core (#1359) 2021-10-23 12:17:32 -07:00