Skip to content

Commit 30c582d

Browse files
committed
remove poetry core compat code (MAIN_GROUP)
1 parent c68011d commit 30c582d

File tree

9 files changed

+11
-55
lines changed

9 files changed

+11
-55
lines changed

Diff for: src/poetry/console/commands/add.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,12 @@
77

88
from cleo.helpers import argument
99
from cleo.helpers import option
10+
from poetry.core.packages.dependency_group import MAIN_GROUP
1011
from tomlkit.toml_document import TOMLDocument
1112

12-
from poetry.utils.helpers import canonicalize_name
13-
14-
15-
try:
16-
from poetry.core.packages.dependency_group import MAIN_GROUP
17-
except ImportError:
18-
MAIN_GROUP = "default"
19-
2013
from poetry.console.commands.init import InitCommand
2114
from poetry.console.commands.installer_command import InstallerCommand
15+
from poetry.utils.helpers import canonicalize_name
2216

2317

2418
class AddCommand(InstallerCommand, InitCommand):

Diff for: src/poetry/console/commands/group_command.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@
33
from typing import TYPE_CHECKING
44

55
from cleo.helpers import option
6-
7-
8-
try:
9-
from poetry.core.packages.dependency_group import MAIN_GROUP
10-
except ImportError:
11-
MAIN_GROUP = "default"
6+
from poetry.core.packages.dependency_group import MAIN_GROUP
127

138
from poetry.console.commands.env_command import EnvCommand
149

Diff for: src/poetry/console/commands/remove.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,11 @@
44

55
from cleo.helpers import argument
66
from cleo.helpers import option
7+
from poetry.core.packages.dependency_group import MAIN_GROUP
78
from tomlkit.toml_document import TOMLDocument
89

9-
from poetry.utils.helpers import canonicalize_name
10-
11-
12-
try:
13-
from poetry.core.packages.dependency_group import MAIN_GROUP
14-
except ImportError:
15-
MAIN_GROUP = "default"
16-
1710
from poetry.console.commands.installer_command import InstallerCommand
11+
from poetry.utils.helpers import canonicalize_name
1812

1913

2014
class RemoveCommand(InstallerCommand):

Diff for: src/poetry/console/commands/self/install.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
from __future__ import annotations
22

3-
4-
try:
5-
from poetry.core.packages.dependency_group import MAIN_GROUP
6-
except ImportError:
7-
MAIN_GROUP = "default"
3+
from poetry.core.packages.dependency_group import MAIN_GROUP
84

95
from poetry.console.commands.install import InstallCommand
106
from poetry.console.commands.self.self_command import SelfCommand

Diff for: src/poetry/factory.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
from cleo.io.null_io import NullIO
1313
from poetry.core.factory import Factory as BaseFactory
14+
from poetry.core.packages.dependency_group import MAIN_GROUP
1415
from poetry.core.packages.project_package import ProjectPackage
1516
from poetry.core.toml.file import TOMLFile
1617
from tomlkit.toml_document import TOMLDocument
@@ -22,12 +23,6 @@
2223
from poetry.poetry import Poetry
2324

2425

25-
try:
26-
from poetry.core.packages.dependency_group import MAIN_GROUP
27-
except ImportError:
28-
MAIN_GROUP = "default"
29-
30-
3126
if TYPE_CHECKING:
3227
from pathlib import Path
3328

Diff for: src/poetry/puzzle/solver.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
from typing import Tuple
1010
from typing import TypeVar
1111

12-
13-
try:
14-
from poetry.core.packages.dependency_group import MAIN_GROUP
15-
except ImportError:
16-
MAIN_GROUP = "default"
12+
from poetry.core.packages.dependency_group import MAIN_GROUP
1713

1814
from poetry.mixology import resolve_version
1915
from poetry.mixology.failure import SolveFailure

Diff for: tests/console/commands/test_install.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,9 @@
55
import pytest
66

77
from poetry.core.masonry.utils.module import ModuleOrPackageNotFound
8+
from poetry.core.packages.dependency_group import MAIN_GROUP
89

910

10-
try:
11-
from poetry.core.packages.dependency_group import MAIN_GROUP
12-
except ImportError:
13-
MAIN_GROUP = "default"
14-
1511
if TYPE_CHECKING:
1612
from cleo.testers.command_tester import CommandTester
1713
from pytest_mock import MockerFixture

Diff for: tests/console/commands/test_show.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,9 @@
44

55
import pytest
66

7+
from poetry.core.packages.dependency_group import MAIN_GROUP
78
from poetry.core.packages.dependency_group import DependencyGroup
89

9-
10-
try:
11-
from poetry.core.packages.dependency_group import MAIN_GROUP
12-
except ImportError:
13-
MAIN_GROUP = "default"
14-
1510
from poetry.factory import Factory
1611
from tests.helpers import get_package
1712

Diff for: tests/installation/test_installer.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,12 @@
1515
from cleo.io.outputs.buffered_output import BufferedOutput
1616
from cleo.io.outputs.output import Verbosity
1717
from deepdiff import DeepDiff
18+
from poetry.core.packages.dependency_group import MAIN_GROUP
1819
from poetry.core.packages.dependency_group import DependencyGroup
1920
from poetry.core.packages.package import Package
2021
from poetry.core.packages.project_package import ProjectPackage
2122
from poetry.core.toml.file import TOMLFile
2223

23-
24-
try:
25-
from poetry.core.packages.dependency_group import MAIN_GROUP
26-
except ImportError:
27-
MAIN_GROUP = "default"
28-
2924
from poetry.factory import Factory
3025
from poetry.installation import Installer as BaseInstaller
3126
from poetry.installation.executor import Executor as BaseExecutor

0 commit comments

Comments
 (0)