Suhas
9901ccd538
Defer config_override unpacking to dict *after* base config is loaded
...
store cli overrides without unpacking just yet
move deserialize_config_args to config module
delete custom Action class for config operations
apply [k,v] -> {k, v} for each override
update test data
update import
2021-02-28 17:34:39 -05:00
Suhas
1af8c79fcd
consolidate imports
2021-02-27 22:20:30 -05:00
Suhas
21c244ec1a
Address code review
...
yield -> return
remove needless copy
adjust spacing
re-inline args return
reset packaging info to e6c0a16342
2021-02-27 22:18:11 -05:00
Suhas
0a2305f397
remove skipped tests for windows
2021-02-27 21:47:59 -05:00
sriniv27
85ae0f48fb
remove wip tag from test
2021-02-20 13:18:53 -05:00
sriniv27
7564cfb381
rebases are hard
2021-02-18 08:56:58 -05:00
sriniv27
289a307b26
delete unused and redundant code
2021-02-18 08:53:09 -05:00
sriniv27
0b79128023
merge config override step with existing config_var step in core
...
delete config_override step
unify step description syntax
2021-02-18 08:48:20 -05:00
sriniv27
ca8e9f85e4
forward override unpacking to yaml library
2021-02-17 07:46:22 -05:00
sriniv27
bd0394c124
Merge branch 'lockfile-merge' of https://github.com/sriniv27/jrnl into lockfile-merge
2021-02-16 08:01:11 -05:00
sriniv27
87a1912d24
remove skip_win
2021-02-16 08:01:09 -05:00
Suhas
dd0c5a6134
Update .gitignore
2021-02-16 07:59:45 -05:00
sriniv27
4ef277e2cf
defer modification of loaded configuration to update_config
...
remove unused fixtures
delete complicated UT since behavior is covered in overrides.feature integ test
delete redundant UT
2021-02-16 07:57:15 -05:00
sriniv27
f36c5c61dd
separate out smaller pieces of logic
...
test that apply_overrides acts on base configuration and not the copy
2021-02-16 07:57:02 -05:00
sriniv27
531fba3b37
complex behavior sequence for default journal override
2021-02-13 21:11:45 -05:00
sriniv27
20450a9b8a
make CI happy
2021-02-13 11:27:57 -05:00
sriniv27
8d952bad8f
remove "mock" from poetry file
2021-02-12 20:06:08 -05:00
sriniv27
8d065a4173
update wip test for updating a "temp" journal and then reading baack its entries
2021-02-12 19:42:16 -05:00
sriniv27
304b39c528
correct command for overriding journal via dot keys
2021-02-12 19:41:25 -05:00
sriniv27
be2844fd40
skip -> wip
2021-02-12 18:09:27 -05:00
sriniv27
b6fa68471b
[WIP] lock down journal access behavior
2021-02-12 17:55:56 -05:00
sriniv27
0f80201517
clean up step behavior description
2021-02-12 17:54:54 -05:00
sriniv27
ccba68013c
comment on step
2021-02-12 17:54:07 -05:00
sriniv27
4f933181c6
delete redundant step
2021-02-12 17:52:57 -05:00
sriniv27
0bf4e52c9f
renamed variable
2021-02-12 17:50:13 -05:00
sriniv27
e889585935
remove unneeded imports
2021-02-12 17:47:17 -05:00
sriniv27
ec9b078a7d
capture failure mode
2021-02-09 22:52:07 -05:00
sriniv27
a110f4431f
update gitignore
2021-02-09 22:51:31 -05:00
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
