Skip to content

Commit

Permalink
refacto: make naming more consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
Guts committed Mar 20, 2024
1 parent 7f3ec24 commit 6ddfccc
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
8 changes: 4 additions & 4 deletions dicogis/cli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# ########## Globals ###############
# ##################################

cli_dicogis = typer.Typer()
dicogis_cli = typer.Typer()
state = {"verbose": False}
APP_NAME = __title__
logger = logging.getLogger(__name__)
Expand All @@ -43,7 +43,7 @@ def version_callback(value: bool):
raise typer.Exit()


@cli_dicogis.callback()
@dicogis_cli.callback()
def main(
verbose: Annotated[
bool,
Expand Down Expand Up @@ -76,12 +76,12 @@ def main(


# integrate subcommands
cli_dicogis.add_typer(cli_list, name="list")
dicogis_cli.add_typer(cli_list, name="list")


# ############################################################################
# #### Stand alone program ########
# #################################
if __name__ == "__main__":
"""standalone execution"""
cli_dicogis()
dicogis_cli()
6 changes: 3 additions & 3 deletions dicogis/ui/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
# ##################################


def main_gui_launcher():
def dicogis_gui():
"""Launch DicoGIS GUI."""
# LOG

logging.captureWarnings(True)
logger.setLevel(logging.DEBUG) # all errors will be get
log_form = logging.Formatter(
Expand Down Expand Up @@ -105,4 +105,4 @@ def main_gui_launcher():

if __name__ == "__main__":
"""standalone execution"""
main_gui_launcher()
dicogis_gui()
9 changes: 5 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def load_requirements(requirements_files: Path | list[Path]) -> list:
),
include_package_data=True,
# dependencies
python_requires=">=3.9, <4",
python_requires=">=3.10, <4",
extras_require={
"dev": load_requirements(HERE / "requirements/development.txt"),
"doc": load_requirements(HERE / "requirements/documentation.txt"),
Expand All @@ -91,10 +91,10 @@ def load_requirements(requirements_files: Path | list[Path]) -> list:
# run
entry_points={
"console_scripts": [
f"{__about__.__package_name__}-cli = dicogis.cli.main:cli_dicogis"
f"{__about__.__package_name__}-cli = dicogis.cli.main:dicogis_cli"
],
"gui_scripts": [
f"{__about__.__package_name__}-gui = dicogis.ui.main:main_gui_launcher",
f"{__about__.__package_name__}-gui = dicogis.ui.main:dicogis_gui",
],
},
# metadata
Expand All @@ -103,15 +103,16 @@ def load_requirements(requirements_files: Path | list[Path]) -> list:
"Intended Audience :: End Users/Desktop",
"Intended Audience :: Information Technology",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: Implementation :: CPython",
"Development Status :: 5 - Production/Stable",
"Environment :: Win32 (MS Windows)",
"License :: OSI Approved :: Apache Software License 2.0",
"Operating System :: OS Independent",
"Operating System :: Microsoft :: Windows :: Windows 10",
"Operating System :: Microsoft :: Windows :: Windows 11",
"Topic :: Scientific/Engineering :: GIS",
],
)

0 comments on commit 6ddfccc

Please sign in to comment.