Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: warning about __main__ already being imported #884

Merged
merged 1 commit into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nox/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from __future__ import annotations

from nox import project
from nox.__main__ import main
from nox._cli import main
from nox._options import noxfile_options as options
from nox._parametrize import Param as param
from nox._parametrize import parametrize_decorator as parametrize
Expand Down
51 changes: 3 additions & 48 deletions nox/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,56 +19,11 @@
control to :meth:``nox.workflow.execute``.
"""

from __future__ import annotations
from __future__ import annotations # pragma: no cover

import sys
from typing import Any
from nox._cli import main # pragma: no cover

from nox import _options, tasks, workflow
from nox._version import get_nox_version
from nox.logger import setup_logging


def execute_workflow(args: Any) -> int:
"""
Execute the appropriate tasks.
"""

return workflow.execute(
global_config=args,
workflow=(
tasks.load_nox_module,
tasks.merge_noxfile_options,
tasks.discover_manifest,
tasks.filter_manifest,
tasks.honor_list_request,
tasks.run_manifest,
tasks.print_summary,
tasks.create_report,
tasks.final_reduce,
),
)


def main() -> None:
args = _options.options.parse_args()

if args.help:
_options.options.print_help()
return

if args.version:
print(get_nox_version(), file=sys.stderr)
return

setup_logging(
color=args.color, verbose=args.verbose, add_timestamp=args.add_timestamp
)

exit_code = execute_workflow(args)

# Done; exit.
sys.exit(exit_code)
__all__ = ["main"] # pragma: no cover


if __name__ == "__main__": # pragma: no cover
Expand Down
66 changes: 66 additions & 0 deletions nox/_cli.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# Copyright 2016 Alethea Katherine Flowers
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""The Nox `main` function and helpers."""

from __future__ import annotations

import sys
from typing import Any

from nox import _options, tasks, workflow
from nox._version import get_nox_version
from nox.logger import setup_logging


def execute_workflow(args: Any) -> int:
"""
Execute the appropriate tasks.
"""

return workflow.execute(
global_config=args,
workflow=(
tasks.load_nox_module,
tasks.merge_noxfile_options,
tasks.discover_manifest,
tasks.filter_manifest,
tasks.honor_list_request,
tasks.run_manifest,
tasks.print_summary,
tasks.create_report,
tasks.final_reduce,
),
)


def main() -> None:
args = _options.options.parse_args()

if args.help:
_options.options.print_help()
return

if args.version:
print(get_nox_version(), file=sys.stderr)
return

setup_logging(
color=args.color, verbose=args.verbose, add_timestamp=args.add_timestamp
)

exit_code = execute_workflow(args)

# Done; exit.
sys.exit(exit_code)
Loading