Skip to content

Commit 1fc8183

Browse files
committed
Revert "temporarily switch back to relative imports for the new release"
This reverts commit 96455c6.
1 parent 96455c6 commit 1fc8183

File tree

15 files changed

+25
-30
lines changed

15 files changed

+25
-30
lines changed

.isort.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[settings]
2-
known_third_party = aenum,aiofiles,bs4,dependency_injector,dotenv,enochecker_core,flask,flask_restful,httpx,jsons,main,matplotlib,numpy,paramiko,pyfakefs,pytest,requests,rich,scipy,selenium,tenacity,webdriver_manager
2+
known_third_party = aenum,aiofiles,backend,bs4,containers,dependency_injector,dotenv,enochecker_core,flask,flask_restful,httpx,jsons,main,matplotlib,numpy,paramiko,pyfakefs,pytest,requests,rich,scipy,selenium,setup,simulation,tenacity,types_,webdriver_manager

enosimulator/backend/app.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66

77
from flask import Flask, request
88
from flask_restful import Api, Resource
9+
from setup import Setup
10+
from simulation import Simulation
911
from tenacity import retry, stop_after_attempt
1012

11-
from ..setup import Setup
12-
from ..simulation import Simulation
13-
1413

1514
class Teams(Resource):
1615
"""

enosimulator/containers.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
from threading import Lock
22

3+
from backend import FlaskApp
34
from dependency_injector import containers, providers
45
from httpx import AsyncClient
56
from rich.console import Console
6-
7-
from .backend import FlaskApp
8-
from .setup import Setup
9-
from .setup.setup_helper import SetupHelper, TeamGenerator
10-
from .simulation import FlagSubmitter, Orchestrator, Simulation, StatChecker
11-
from .types_ import Config, Secrets
7+
from setup import Setup
8+
from setup.setup_helper import SetupHelper, TeamGenerator
9+
from simulation import FlagSubmitter, Orchestrator, Simulation, StatChecker
10+
from types_ import Config, Secrets
1211

1312

1413
class SetupContainer(containers.DeclarativeContainer):

enosimulator/main.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
import sys
55
from threading import Thread
66

7+
from containers import Application
78
from dotenv import load_dotenv
89

9-
from .containers import Application
10-
1110

1211
def get_args() -> argparse.Namespace:
1312
"""

enosimulator/setup/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from requests import get
1010
from rich.console import Console
1111
from rich.table import Table
12+
from types_ import Config, IpAddresses, Secrets, Service, SimulationType, VMType
1213

13-
from ..types_ import Config, IpAddresses, Secrets, Service, SimulationType, VMType
1414
from .setup_helper import SetupHelper
1515
from .util import create_file, delete_files, execute_command, kebab_to_camel, parse_json
1616

enosimulator/setup/setup_helper/azure_converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from typing import Dict, Tuple
44

55
import aiofiles
6+
from types_ import Config, Secrets, VMType
67

7-
from ...types_ import Config, Secrets, VMType
88
from .base_converter import TemplateConverter
99
from .util import append_lines, copy_file, delete_lines, insert_after, replace_line
1010

enosimulator/setup/setup_helper/hetzner_converter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
from typing import Dict, Tuple
33

44
import aiofiles
5+
from types_ import Config, Secrets, VMType
56

6-
from ...types_ import Config, Secrets, VMType
77
from .base_converter import TemplateConverter
88
from .util import append_lines, copy_file, delete_lines, insert_after, replace_line
99

enosimulator/setup/setup_helper/local_converter.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import os
22
from typing import Dict, Tuple
33

4-
from ...types_ import Config, Secrets
4+
from types_ import Config, Secrets
5+
56
from .base_converter import TemplateConverter
67

78

enosimulator/setup/setup_helper/setup_helper.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from typing import Dict, List, Tuple
22

3-
from ...types_ import Config, Secrets, SetupVariant, SimulationType
3+
from types_ import Config, Secrets, SetupVariant, SimulationType
4+
45
from .azure_converter import AzureConverter
56
from .hetzner_converter import HetznerConverter
67
from .local_converter import LocalConverter

enosimulator/setup/setup_helper/team_generator.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
from aenum import extend_enum
77
from rich.console import Console
8-
9-
from ...types_ import Config, Experience, SimulationType, Team
8+
from types_ import Config, Experience, SimulationType, Team
109

1110
TEAM_NAMES = [
1211
"Edible Frog",

0 commit comments

Comments
 (0)