Resolve import cycle
This commit is contained in:
parent
1d5c4ccbee
commit
45fc16c132
2 changed files with 10 additions and 6 deletions
|
@ -1,17 +1,19 @@
|
||||||
import functools
|
import functools
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Optional, Dict, Any
|
from typing import TYPE_CHECKING, Optional, Dict, Any
|
||||||
|
|
||||||
import attr
|
import attr
|
||||||
from ruamel.yaml import CommentedMap
|
from ruamel.yaml import CommentedMap
|
||||||
|
|
||||||
from ._constants import COMPOSE_FILE_NAME, CONF_DIRECTORY_NAME
|
from ._constants import COMPOSE_FILE_NAME, CONF_DIRECTORY_NAME
|
||||||
from .config import ProjectConfig
|
from .config import ProjectConfig
|
||||||
from .instance import Instance
|
|
||||||
from .service import Service
|
from .service import Service
|
||||||
from .services import Services
|
from .services import Services
|
||||||
from .yaml import YAML
|
from .yaml import YAML
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from .instance import Instance
|
||||||
|
|
||||||
|
|
||||||
@attr.s
|
@attr.s
|
||||||
class Project:
|
class Project:
|
||||||
|
@ -66,4 +68,4 @@ class Project:
|
||||||
content=content,
|
content=content,
|
||||||
parent=self,
|
parent=self,
|
||||||
) for name, content in yml["services"].items()
|
) for name, content in yml["services"].items()
|
||||||
])
|
])
|
||||||
|
|
|
@ -1,13 +1,15 @@
|
||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Generator
|
from typing import TYPE_CHECKING, Generator
|
||||||
|
|
||||||
import attr
|
import attr
|
||||||
from ruamel.yaml import CommentedMap
|
from ruamel.yaml import CommentedMap
|
||||||
|
|
||||||
from .executable import COMPOSE_EXE
|
from .executable import COMPOSE_EXE
|
||||||
from .project import Project
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from .project import Project
|
||||||
|
|
||||||
|
|
||||||
@attr.s
|
@attr.s
|
||||||
|
@ -41,4 +43,4 @@ class Service:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
return False
|
return False
|
||||||
|
|
Loading…
Reference in a new issue