fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 13:08:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1248 commits 12 branches 99 tags 13 MiB
Commit graph

1248 commits

This branch
This branch
All branches
Author SHA1 Message Date
sriniv27
426deee489 reinstate getpass deletion 2021-02-09 22:51:10 -05:00
sriniv27
113d5e7318 rename variable for intent 2021-02-09 22:26:14 -05:00
sriniv27
336df64a05 remove unnecessary mocks 2021-02-09 21:09:20 -05:00
sriniv27
11f4a87b05 test that no editor is launched 2021-02-09 20:35:58 -05:00
sriniv27
93c62215d9 update for passworded access 
context.parser -> parsed_args
 2021-02-09 20:35:53 -05:00
sriniv27
1df4b74e53 move overrides earlier in the execution 
use existing configs instead of custom

make format

clean up imports
 2021-02-09 20:35:44 -05:00
sriniv27
c8e09b023f reuse existing mock; delete unneeded code 2021-02-09 20:35:44 -05:00
sriniv27
9b80d56773 update docs 2021-02-09 20:35:44 -05:00
Suhas Srinivasan
ac819eb28f update lockfile to remove pytest-cov and pytest-mock deps 2021-02-01 13:43:12 -05:00
Suhas
f6e6436320
Update pyproject.toml 2021-02-01 13:40:53 -05:00
Suhas Srinivasan
44310cb2db formatting 2021-02-01 13:38:55 -05:00
Suhas Srinivasan
f250406e7d Merge branch 'develop' into lockfile-merge 2021-02-01 13:37:22 -05:00
Suhas
2be0d3729e
Simplify config override syntax (#8) 
* update tests and expected behavior

* clean up arg parsing tests

* update deserialization

* update deserialization

* config argparse action

* update override application logic

* update tests; delete unused imports

* override param must be list

* update docstring

* update test input to SUT

* update remaining override unittests

* make format

* forgot to update CLI syntax
 2021-02-01 13:30:59 -05:00
Suhas
d55fa4134a
Lockfile merge (#7) 
* Add brew and gitter badges to README

* Update changelog [ci skip]

* Make journal selection behavior more consistent when there's a colon with no date (#1164)

* Bump pytest from 6.2.1 to 6.2.2 (#1167)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.1...6.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump keyring from 21.8.0 to 22.0.1 (#1168)

Bumps [keyring](https://github.com/jaraco/keyring) from 21.8.0 to 22.0.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/v21.8.0...v22.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update changelog [ci skip]

Co-authored-by: Micah Jerome Ellison <micah.jerome.ellison@gmail.com>
Co-authored-by: Jrnl Bot <jrnl.bot@gmail.com>
Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-01 13:22:55 -05:00
dependabot[bot]
a51db6c614
Bump pytz from 2020.5 to 2021.1 (#6) 
Bumps [pytz](https://github.com/stub42/pytz) from 2020.5 to 2021.1.
- [Release notes](https://github.com/stub42/pytz/releases)
- [Commits](https://github.com/stub42/pytz/compare/release_2020.5...release_2021.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-01 13:21:56 -05:00
Suhas
318e45e2ad variable renames 2021-01-31 20:31:23 -05:00
Suhas
e26fd0721b update documentation to sphinx style 2021-01-31 20:31:13 -05:00
Suhas
6e658c31df
Simplify config override syntax (#5) 
* update tests and expected behavior

* clean up arg parsing tests

* update deserialization

* update deserialization

* config argparse action

* update override application logic

* update tests; delete unused imports

* override param must be list

* update docstring

* update test input to SUT

* update remaining override unittests

* make format

* forgot to update CLI syntax
 2021-01-31 20:17:02 -05:00
Suhas
d9f441face
Merge branch 'develop' into lockfile-merge 2021-01-30 19:05:43 -05:00
Jrnl Bot
eca002ac29 Update changelog [ci skip] 2021-01-30 21:49:37 +00:00
dependabot[bot]
6e28b0b4a1
Bump keyring from 21.8.0 to 22.0.1 (#1168) 
Bumps [keyring](https://github.com/jaraco/keyring) from 21.8.0 to 22.0.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/v21.8.0...v22.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-30 13:48:08 -08:00
dependabot[bot]
fbb40b75f6
Bump pytest from 6.2.1 to 6.2.2 (#1167) 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.1...6.2.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-30 13:47:37 -08:00
Jonathan Wren
ea845a8408
Make journal selection behavior more consistent when there's a colon with no date (#1164) 2021-01-30 13:47:26 -08:00
Jrnl Bot
ac0c49918d Update changelog [ci skip] 2021-01-30 21:34:06 +00:00
Micah Jerome Ellison
bd1c5c3f62
Add brew and gitter badges to README 2021-01-30 13:31:24 -08:00
Suhas
40f93a9322 document config-override enhancement 2021-01-29 20:11:13 -05:00
Suhas
7df83aa44a update gitignore 2021-01-29 20:11:00 -05:00
Suhas
dbf4650004 document apply_overrides 2021-01-28 21:30:10 -05:00
Suhas
ac85511dfe make format 2021-01-28 20:58:57 -05:00
Suhas
4205543c02 Merge branch 'develop' of https://github.com/sriniv27/jrnl into develop 2021-01-28 20:52:41 -05:00
Suhas
56255cd69c space 2021-01-28 20:52:14 -05:00
Suhas
adb7932817 make format 2021-01-28 20:52:14 -05:00
Suhas
3b7e05c69f update tests ith better verifications 2021-01-28 20:52:04 -05:00
Suhas
8ea258c544 refactor deserialization 
organize test_parse_args

make format
 2021-01-28 20:49:47 -05:00
Suhas
9a19c370e3 skip on win 2021-01-28 20:49:47 -05:00
Suhas
2a618761d0 Merge branch 'develop' of https://github.com/sriniv27/jrnl into develop 2021-01-28 20:48:06 -05:00
dependabot[bot]
3731ccbb43 Bump keyring from 21.8.0 to 22.0.1 
Bumps [keyring](https://github.com/jaraco/keyring) from 21.8.0 to 22.0.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/v21.8.0...v22.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-28 20:47:12 -05:00
Suhas
1a99d65ee4 refactor deserialization 
organize test_parse_args

make format
 2021-01-28 20:47:12 -05:00
dependabot[bot]
54a5a68da9 Bump pytest from 6.2.1 to 6.2.2 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.1...6.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-28 20:47:12 -05:00
Suhas
e74420bbd5 update deps 2021-01-28 20:47:12 -05:00
Suhas
8624fd3e01 skip on win 2021-01-28 20:47:12 -05:00
Suhas
6e09f93f16 update tests with better verifications 
make format

space

review feedbac
 2021-01-28 20:47:00 -05:00
Suhas
63a5519ac0
Merge pull request #4 from sriniv27/dependabot/pip/keyring-22.0.1 
Bump keyring from 21.8.0 to 22.0.1
 2021-01-28 15:13:12 -05:00
Suhas
0bb4c80517
Merge pull request #3 from sriniv27/dependabot/pip/pytest-6.2.2 
Bump pytest from 6.2.1 to 6.2.2
 2021-01-28 15:12:49 -05:00
Suhas
206336651a update deps 2021-01-28 09:26:27 -05:00
Suhas
c4c4155826 skip on win 2021-01-28 09:21:43 -05:00
Suhas
6e0a47ccf7 make format 2021-01-28 08:58:24 -05:00
dependabot[bot]
5e4eb66620
Bump keyring from 21.8.0 to 22.0.1 
Bumps [keyring](https://github.com/jaraco/keyring) from 21.8.0 to 22.0.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/v21.8.0...v22.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-28 13:58:18 +00:00
dependabot[bot]
e95ab585cf
Bump pytest from 6.2.1 to 6.2.2 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.1...6.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-01-28 13:58:06 +00:00
Suhas
18458b7299
Merge pull request #2 from sriniv27/double-delimited-text-input-for-config-override 
Double delimited text input for config override
 2021-01-28 08:51:30 -05:00