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

1364 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jrnl Bot
a32aefe541 Increment version to v2.8.3-beta 2021-08-28 22:58:59 +00:00
Jrnl Bot
3c561af93d Update changelog [ci skip] 2021-08-28 20:22:11 +00:00
dependabot[bot]
7eaeef821e
Bump cryptography from 3.4.7 to 3.4.8 (#1329) 
Bumps [cryptography](https://github.com/pyca/cryptography) from 3.4.7 to 3.4.8.
- [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.7...3.4.8)

---
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>
 2021-08-28 13:20:25 -07:00
Jrnl Bot
7030185e4f Update changelog [ci skip] 2021-08-28 20:20:16 +00:00
Micah Jerome Ellison
5abf974682
Fix deletion of entries on folder journal through --delete flag (#1328) 
* Re-enable failing folder/DayOne tests
* Disable dayone tests again - out of scope for this problem
* Fix folder journal deletion by tracking which dates are associated with deleted entries
 2021-08-28 13:18:34 -07:00
Micah Jerome Ellison
fa146b1434
Warn when DayOne/directory journals have encrypt: true in config (#1325) 
* Raise exception when trying to commit folder-based journal (including DayOne)
* Change negative bool name to a positive
* Add test to ensure this doesn't mess with encrypting normal journals
* Consolidate and standardized tests
* Add failing test for new error message about unencryptable journals
* Warn when encrypt is true and journal type is directory/DayOne
 2021-08-21 14:47:49 -07:00
Jrnl Bot
c52e878c01 Update changelog [ci skip] 2021-08-21 21:44:38 +00:00
Micah Jerome Ellison
050c17ee06
Allow emoji in config file in Windows by always opening it as unicode (#1313) 
* Open config file as utf-8 always
* Add test for journal with emoji name
 2021-08-21 14:43:11 -07:00
Micah Jerome Ellison
7109374d42
Fix failure to import into directory journal (#1314) 
* Re-enable failing directory journal import tests
* Appropriately track journal name and modified entries in FolderJournal when importing
* Run make format
 2021-08-21 14:42:31 -07:00
Jonathan Wren
08350b884b
take out redundant lines from PR template (#1327) 2021-08-21 14:00:31 -07:00
Jrnl Bot
bacbf8109b Update changelog [ci skip] 2021-08-21 20:48:08 +00:00
Micah Jerome Ellison
3e5a55b1e9
Display error when trying to encrypt folder/DayOne journal types (#1315) 
* Raise exception when trying to commit folder-based journal (including DayOne)
* Add test to ensure this doesn't mess with encrypting normal journals
* Consolidate and standardized tests
 2021-08-21 13:46:29 -07:00
Jrnl Bot
9de723d014 Update changelog [ci skip] 2021-08-21 19:10:25 +00:00
Micah Jerome Ellison
a0a3ef669e
Set bash as default shell (#1324) 2021-08-21 12:08:44 -07:00
Jrnl Bot
1c63d94736 Update changelog [ci skip] 2021-08-17 03:24:18 +00:00
dependabot[bot]
32b5a2b5d0
Bump keyring from 23.0.1 to 23.1.0 (#1318) 
Bumps [keyring](https://github.com/jaraco/keyring) from 23.0.1 to 23.1.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.0.1...v23.1.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-08-16 20:22:39 -07:00
Jonathan Wren
3b93e92960
take out arg for old plugin from makefile (#1322) 2021-08-16 20:13:44 -07:00
Jrnl Bot
5ec7dec9f0 Update changelog [ci skip] 2021-08-17 02:47:47 +00:00
Jonathan Wren
8a64b77e63
Update build to poetry alpha 2 for python 3.10 (#1320) 
* udpate build to poetry alpha 2 for python 3.10

* update testing workflow to run when workflow itself is changed
 2021-08-16 19:46:01 -07:00
Jrnl Bot
b23c831da5 Update changelog [ci skip] 2021-07-31 19:11:33 +00:00
Jrnl Bot
eaaa7bb0e1 Increment version to v2.8.2 2021-07-31 19:10:05 +00:00
Jrnl Bot
c49853d724 Update changelog [ci skip] 2021-07-31 18:47:00 +00:00
dependabot[bot]
642155292a
Bump mkdocs from 1.2.1 to 1.2.2 (#1307) 
Bumps [mkdocs](https://github.com/mkdocs/mkdocs) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/mkdocs/mkdocs/releases)
- [Commits](https://github.com/mkdocs/mkdocs/compare/1.2.1...1.2.2)

---
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-07-31 11:45:19 -07:00
Micah Jerome Ellison
c9c6e7efc1
Fix typo in --help (#1309) 2021-07-31 11:43:19 -07:00
Jrnl Bot
1ba1b756c9 Update changelog [ci skip] 2021-07-17 22:17:56 +00:00
Jrnl Bot
f158d7f266 Increment version to v2.8.2-beta 2021-07-17 22:16:08 +00:00
Jrnl Bot
cef3a98b4e Update changelog [ci skip] 2021-07-17 20:23:48 +00:00
Micah Jerome Ellison
31f782e333
Add documentation about saved passwords in Windows (#1301) 
* Add note about saved passwords
* Add missing yq dep back in to allow xq to run in mkdocs CI pipeline
 2021-07-17 13:22:01 -07:00
Jrnl Bot
3e95a46bd2 Update changelog [ci skip] 2021-07-17 19:15:00 +00:00
dependabot[bot]
52c0a0ebf3
Bump python-dateutil from 2.8.1 to 2.8.2 (#1302) 
Bumps [python-dateutil](https://github.com/dateutil/dateutil) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/dateutil/dateutil/releases)
- [Changelog](https://github.com/dateutil/dateutil/blob/master/NEWS)
- [Commits](https://github.com/dateutil/dateutil/compare/2.8.1...2.8.2)

---
updated-dependencies:
- dependency-name: python-dateutil
  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>
 2021-07-17 12:13:19 -07:00
Jrnl Bot
b896c85bf0 Update changelog [ci skip] 2021-07-17 19:03:29 +00:00
Micah Jerome Ellison
7b72b24ee2
Add first draft of security.md (#1299) 2021-07-17 12:01:59 -07:00
Jonathan Wren
e771c9da81
Update lock file from poetry stable version (#1298) 2021-07-10 13:53:00 -07:00
Jrnl Bot
9bd395007f Update changelog [ci skip] 2021-07-10 19:14:56 +00:00
Micah Jerome Ellison
2723e1cfb5
Add Python 3.10 support (#1271) 
* Add Python 3.10 support

* Change Python 3.10 to 3.10-dev in CI

* Run poetry update

* Turn off fail-fast to troubleshoot

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

* Add continue-on-error for 3.10

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

* use prerelease poetry for prerelease python

* fix syntax error

* rename steps to make more sense

* remove dev dependency that breaks with python 3.10

* update tests

* Change test dependencies for minimal breakage on python 3.10

- loosen the test dep requirements (so we get warned about these
  problems sooner)
- add new extras group to provide minimal deps required for testing (we
  don't need to run static analysis again on every version)

* change how we check if deps are installed so test don't run wild

* add setuptools due to poetry bug, clean up other steps

* update lock file

* test

* Revert "test"

This reverts commit 31e538300e.

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2021-07-10 12:13:15 -07:00
Jrnl Bot
56df419bea Update changelog [ci skip] 2021-07-03 22:52:14 +00:00
Micah Jerome Ellison
9e3153453e
Change all instances of FullLoader to SafeLoader (#1285) 2021-07-03 15:50:36 -07:00
Jonathan Wren
26484130c3 remove old comment 2021-07-03 15:49:18 -07:00
Jonathan Wren
495956d907 remove init file that is no longer neded 2021-07-03 15:49:18 -07:00
Jonathan Wren
d95dab9f0c add actual lib directory even though it's in gitignore for some reason 2021-07-03 15:49:18 -07:00
Jonathan Wren
f99411f2f9 move some files around because pytest is being weird 2021-07-03 15:49:18 -07:00
Jonathan Wren
cdad0d6289 Replace pyflakes with flake8 for linting 2021-07-03 15:49:18 -07:00
Jonathan Wren
c5a7d7027c Move pytest-bdd code into separate files 
Now that all the tests are passing, this breaks them up into a few
different files to make everything more organized.

Note: Pyflakes is complaining about some unused import statements.
 2021-07-03 15:49:18 -07:00
Micah Jerome Ellison
54e5e96ad2 Force GitHub Actions to preserve line endings 
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2021-07-03 15:49:18 -07:00
Micah Jerome Ellison
fd349fb0fc Implement ExitStack to handle mocks in pytest-bdd 
- Fix failing DayOne test
- Make format and clean up extraneous comment

Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2021-07-03 15:49:18 -07:00
Jonathan Wren
0c8efd5331 Cleanup last few tests 
- Misc linting issues
- Whitespace cleanup
- Entire test suite is now passing
- Add misc todo items in comments

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
 2021-07-03 15:49:18 -07:00
Jonathan Wren
5572833652 Rewrite config checking steps in pytest-bdd 
- Take out old type coersion (it was causing needles complexity)
- Take out `read_value_from_string` function
- Use taml parser to parse yaml instead of using custom function
- Update tests to use new implementation

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
 2021-07-03 15:49:18 -07:00
Jonathan Wren
b7b7bad2fb Clarify and cleanup tests 
- Run formatter
- Take out old tags
- Use new steps on tests

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
 2021-07-03 15:49:18 -07:00
Jonathan Wren
44b1762b7d Implement stream redirection in pytest-bdd 
- Take out old steps from format and input tests

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
 2021-07-03 15:49:18 -07:00
Micah Jerome Ellison
512fb63e1f Implement test to check editor temporary filename 
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
 2021-07-03 15:49:18 -07:00