fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 08:38:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1524 commits 10 branches 99 tags 14 MiB
Commit graph

1524 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jrnl Bot
54c9a058df Update changelog [ci skip] 2021-10-16 22:23:23 +00:00
Micah Jerome Ellison
b1ba88c138
Migrate contributing.md to docs site (#1266) 
* Initial migration of contributing.md to docs site
* Update contributing to include pytest-bdd changes
* add top level section support, and h2 support in sidebar
* Incorporate latest changes to contributing.md, clean up language and formatting, and check/add links as necessary
* Add a link to milestones
* Update CONTRIBUTING.md

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2021-10-16 15:21:49 -07:00
dependabot[bot]
533d770753 Bump pyyaml from 5.4.1 to 6.0 (#1356) 
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.4.1 to 6.0.
- [Release notes](https://github.com/yaml/pyyaml/releases)
- [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES)
- [Commits](https://github.com/yaml/pyyaml/compare/5.4.1...6.0)

---
updated-dependencies:
- dependency-name: pyyaml
  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>
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2021-10-16 15:06:11 -07:00
Jrnl Bot
8cc891a77f Update changelog [ci skip] 2021-10-16 21:39:13 +00:00
Gianluca Mondini
156ddee97c
Fix recipe 'Launch a terminal for rapid logging' (#1351) 2021-10-16 14:37:43 -07:00
Jrnl Bot
b93b7cdfd6 Update changelog [ci skip] 2021-10-16 20:53:57 +00:00
Fidel H Viegas
9f5c2f6829
Add recipe for visualizing Markdown in the CLI (#1354) 
* Added Recipe for visualizing Markdown in the CLI, fixed some typos and added backticks in all references of jrnl

* mdless recipe changes during review

-condense language
-make it sound less like an endorsement
-add link about less
-minor grammatical change

Co-authored-by: Fidel H Viegas <me@fidelhviegas.com>
Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
 2021-10-16 13:52:13 -07:00
Jrnl Bot
62dc037d80 Update changelog [ci skip] 2021-10-16 20:22:04 +00:00
dependabot[bot]
ae1ad39806
Bump mkdocs from 1.2.2 to 1.2.3 (#1355) 
Bumps [mkdocs](https://github.com/mkdocs/mkdocs) from 1.2.2 to 1.2.3.
- [Release notes](https://github.com/mkdocs/mkdocs/releases)
- [Commits](https://github.com/mkdocs/mkdocs/compare/1.2.2...1.2.3)

---
updated-dependencies:
- dependency-name: mkdocs
  dependency-type: direct:development
  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>
 2021-10-16 13:20:14 -07:00
Jrnl Bot
d347dac19e Update changelog [ci skip] 2021-10-09 19:11:41 +00:00
Jonathan Wren
44edb9bdee
Add more steps to pytest, fully remove behave (#1347) 
* update yaml loader to new method

* Add config overrides steps to pytest

This requires some patching around the config object, which now happens
in every test.

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

* udpate docs for new tests

* remove behave from deps

* remove feature dir from flake8 checks

* udpate lock file

* disable pip version check (it keeps spamming the pipeline)

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
 2021-10-09 12:10:08 -07:00
Jrnl Bot
a98f3f78af Update changelog [ci skip] 2021-10-09 18:45:22 +00:00
dependabot[bot]
1196b05ff6
Bump pytz from 2021.1 to 2021.3 (#1348) 
Bumps [pytz](https://github.com/stub42/pytz) from 2021.1 to 2021.3.
- [Release notes](https://github.com/stub42/pytz/releases)
- [Commits](https://github.com/stub42/pytz/compare/release_2021.1...release_2021.3)

---
updated-dependencies:
- dependency-name: pytz
  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-10-09 11:43:43 -07:00
Jonathan Wren
7d8823da6d
Move remaining tests from behave to pytest (#1346) 
* add newer tests to pytest (from behave)

* remove 'lib' from gitignore (since we're using it)

* fix capitalization in some steps

* add 'the editor should not have been called' step

* comment out config override step in pytest-bdd since it's not implemented yet

* remove test that didn't really test anything

* implement some missing steps in pytest-bdd

* change comment to match other tests
 2021-10-02 13:31:21 -07:00
Jrnl Bot
593245f3fd Update changelog [ci skip] 2021-10-02 19:24:53 +00:00
dependabot[bot]
60c9ed124d
Bump cryptography from 3.4.8 to 35.0.0 (#1345) 
Bumps [cryptography](https://github.com/pyca/cryptography) from 3.4.8 to 35.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/3.4.8...35.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-10-02 12:23:17 -07:00
Micah Jerome Ellison
4c0fb344d1
Add CACHE_STRING secret to bust GitHub Actions python cache (#1344) 
* Add CACHE_STRING secret to allow maintainers to bust cache without a commit

* Quick change

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2021-09-25 11:11:28 -07:00
Jrnl Bot
9f16cc42f5 Update changelog [ci skip] 2021-09-18 23:28:00 +00:00
Micah Jerome Ellison
614be34081
Document journal types (#1331) 
* Add docs section for journal types
* Include new journal types docs section in site nav
* Add section on changing a journal type and clean up work from previous commit
 2021-09-18 16:26:28 -07:00
Jrnl Bot
b932cfc9ad Update changelog [ci skip] 2021-09-18 19:53:58 +00:00
dependabot[bot]
73806c2d30
Bump keyring from 23.1.0 to 23.2.1 (#1342) 
Bumps [keyring](https://github.com/jaraco/keyring) from 23.1.0 to 23.2.1.
- [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.1.0...v23.2.1)

---
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-09-18 12:52:14 -07:00
Jrnl Bot
79e3c94669 Update changelog [ci skip] 2021-09-18 19:51:58 +00:00