diff --git a/python/online/fxreader/pr34/commands_typed/cli.py b/python/online/fxreader/pr34/commands_typed/cli.py index 51a2c02..fee6e21 100644 --- a/python/online/fxreader/pr34/commands_typed/cli.py +++ b/python/online/fxreader/pr34/commands_typed/cli.py @@ -565,10 +565,10 @@ class CLI(abc.ABC): parser.add_argument( '-m', dest='module', - choices=[ - o.name - for o in project.modules - ], + # choices=[ + # o.name + # for o in project.modules + # ], required=True, # type=pathlib.Path, type=str, @@ -577,8 +577,7 @@ class CLI(abc.ABC): parser.add_argument( '-f', dest='file', - default='pyproject.common.toml', - default=[], + default=pathlib.Path('pyproject.common.toml'), # type=pathlib.Path, type=pathlib.Path, ) @@ -588,7 +587,16 @@ class CLI(abc.ABC): argv, ) - if not options.file.is_abs(): + if not options.file.is_absolute(): options.file = project.source_dir / options.file + pyproject = cli_bootstrap.pyproject_load( + options.file, + ) + + assert options.module in [ + o.name + for o in pyproject.modules + ] + raise NotImplementedError diff --git a/python/pyproject.toml b/python/pyproject.toml index fdb78a9..6254bbb 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = 'online.fxreader.pr34' -version = '0.1.5.16+28' +version = '0.1.5.16+27.2' dependencies = [ #"-r requirements.txt", diff --git a/releases/whl/online_fxreader_pr34-0.1.5.16+27.1-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.16+27.1-py3-none-any.whl new file mode 100644 index 0000000..fb75307 --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.16+27.1-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bae2399f7d1d3f27dabb8a66713f4c440d2ef98df52acb8d9c151932924f324 +size 70869 diff --git a/releases/whl/online_fxreader_pr34-0.1.5.16+27.2-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.16+27.2-py3-none-any.whl new file mode 100644 index 0000000..fb8b54e --- /dev/null +++ b/releases/whl/online_fxreader_pr34-0.1.5.16+27.2-py3-none-any.whl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0b831baa4fe596a3442a774748625ffa9a8d5b21d897d424d41933dc390b220 +size 70869 diff --git a/releases/whl/online_fxreader_pr34-0.1.5.16+28-py3-none-any.whl b/releases/whl/online_fxreader_pr34-0.1.5.16+28-py3-none-any.whl deleted file mode 100644 index 033e7c8..0000000 --- a/releases/whl/online_fxreader_pr34-0.1.5.16+28-py3-none-any.whl +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:558711c29edacb851e2aa9957f85b2b6f4996e06afa80682df6510d212113450 -size 70698