Skip to content

Commit

Permalink
Reorder imports to avoid lint errors.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 555174159
Change-Id: I12b99fe7288c3996e645622b10e4964a9f6f0a60
  • Loading branch information
jagapiou authored and Copybara-Service committed Aug 9, 2023
1 parent ccfd663 commit 053a0e2
Show file tree
Hide file tree
Showing 137 changed files with 131 additions and 276 deletions.
6 changes: 0 additions & 6 deletions examples/.isort.cfg

This file was deleted.

1 change: 0 additions & 1 deletion examples/rllib/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

from ..gym import utils


PLAYER_STR_FORMAT = 'player_{index}'


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from meltingpot.utils.substrates import shapes
from ml_collections import config_dict


SPAWN_POINT = {
"name": "spawn_point",
"components": [
Expand Down
1 change: 0 additions & 1 deletion meltingpot/bot_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

from absl.testing import absltest
from absl.testing import parameterized

from meltingpot import bot
from meltingpot.testing import bots as test_utils

Expand Down
1 change: 0 additions & 1 deletion meltingpot/configs/bots/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from typing import AbstractSet, Callable, Iterable, Literal, Mapping, Optional, Sequence

import immutabledict

from meltingpot.utils.puppeteers import alternator
from meltingpot.utils.puppeteers import clean_up
from meltingpot.utils.puppeteers import coins
Expand Down
1 change: 0 additions & 1 deletion meltingpot/configs/bots/bot_configs_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

from absl.testing import absltest
from absl.testing import parameterized

from meltingpot.configs import bots
from meltingpot.configs import substrates

Expand Down
1 change: 0 additions & 1 deletion meltingpot/configs/scenarios/scenario_configs_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

from absl.testing import absltest
from absl.testing import parameterized

from meltingpot import bot as bot_factory
from meltingpot.configs import bots
from meltingpot.configs import scenarios
Expand Down
3 changes: 1 addition & 2 deletions meltingpot/configs/substrates/allelopathic_harvest.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@

from typing import Any, Dict, Mapping, Sequence

from ml_collections import config_dict

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import game_object_utils
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

PrefabConfig = game_object_utils.PrefabConfig

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,12 @@

from typing import Any, Dict, Mapping, Sequence, Tuple

from ml_collections import config_dict

from meltingpot.configs.substrates import the_matrix
from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import game_object_utils
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

PrefabConfig = game_object_utils.PrefabConfig

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,12 @@

from typing import Any, Dict, Mapping, Sequence, Tuple

from ml_collections import config_dict

from meltingpot.configs.substrates import the_matrix
from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import game_object_utils
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

PrefabConfig = game_object_utils.PrefabConfig

Expand Down
3 changes: 1 addition & 2 deletions meltingpot/configs/substrates/boat_race.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,10 @@
from collections.abc import Mapping, Sequence
from typing import Any

from ml_collections import config_dict as configdict

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict as configdict

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
3 changes: 1 addition & 2 deletions meltingpot/configs/substrates/boat_race__eight_races.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
# limitations under the License.
"""Configuration for boat_race__eight_races."""

from ml_collections import config_dict as configdict

from meltingpot.configs.substrates import boat_race as base_config
from ml_collections import config_dict as configdict


def get_config() -> configdict.ConfigDict:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@
from collections.abc import Mapping, Sequence
from typing import Any

from ml_collections import config_dict
import networkx as nx

from meltingpot.configs.substrates import reaction_graph_utils as graph_utils
from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict
import networkx as nx

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@
from collections.abc import Mapping, Sequence
from typing import Any

from ml_collections import config_dict
import networkx as nx

from meltingpot.configs.substrates import reaction_graph_utils as graph_utils
from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict
import networkx as nx

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,12 @@
from collections.abc import Mapping, Sequence
from typing import Any

from ml_collections import config_dict
import networkx as nx

from meltingpot.configs.substrates import reaction_graph_utils as graph_utils
from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict
import networkx as nx

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,12 @@
from collections.abc import Mapping, Sequence
from typing import Any

from ml_collections import config_dict
import networkx as nx

from meltingpot.configs.substrates import reaction_graph_utils as graph_utils
from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict
import networkx as nx

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,12 @@

from typing import Any, Dict, Mapping, Sequence

from ml_collections import config_dict

from meltingpot.configs.substrates import the_matrix
from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import game_object_utils
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

PrefabConfig = game_object_utils.PrefabConfig

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@

from typing import Any, Dict, Mapping, Sequence, Tuple

from ml_collections import config_dict

from meltingpot.configs.substrates import the_matrix
from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
3 changes: 1 addition & 2 deletions meltingpot/configs/substrates/clean_up.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,11 @@

from typing import Any, Dict, Mapping, Sequence

from ml_collections import config_dict

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import game_object_utils
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

PrefabConfig = game_object_utils.PrefabConfig

Expand Down
3 changes: 1 addition & 2 deletions meltingpot/configs/substrates/coins.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@
import random
from typing import Any

from ml_collections import config_dict as configdict

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import game_object_utils
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict as configdict

PrefabConfig = game_object_utils.PrefabConfig

Expand Down
3 changes: 1 addition & 2 deletions meltingpot/configs/substrates/collaborative_cooking.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,11 @@
import copy
from typing import Any, Dict, Mapping, Sequence

from ml_collections import config_dict as configdict

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import game_object_utils
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict as configdict

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@
responsibilities for optimally creating and delivering soups.
"""

from ml_collections import config_dict

from meltingpot.configs.substrates import collaborative_cooking as base_config
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

build = base_config.build

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@
Ring layout.
"""

from ml_collections import config_dict

from meltingpot.configs.substrates import collaborative_cooking as base_config
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

build = base_config.build

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@
the players in order to avoid being blocked by each other.
"""

from ml_collections import config_dict

from meltingpot.configs.substrates import collaborative_cooking as base_config
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

build = base_config.build

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@
team will get in one another's way.
"""

from ml_collections import config_dict

from meltingpot.configs.substrates import collaborative_cooking as base_config
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

build = base_config.build

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@
way, so in practice, collaboration is essential.
"""

from ml_collections import config_dict

from meltingpot.configs.substrates import collaborative_cooking as base_config
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

build = base_config.build

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@
(using the items provided by the first player).
"""

from ml_collections import config_dict

from meltingpot.configs.substrates import collaborative_cooking as base_config
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

build = base_config.build

Expand Down
3 changes: 1 addition & 2 deletions meltingpot/configs/substrates/collaborative_cooking__ring.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@
If players do not coordinate, they will block each other’s movement.
"""

from ml_collections import config_dict

from meltingpot.configs.substrates import collaborative_cooking as base_config
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

build = base_config.build

Expand Down
5 changes: 2 additions & 3 deletions meltingpot/configs/substrates/commons_harvest__closed.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,11 @@

from typing import Any, Dict, Mapping, Sequence

from ml_collections import config_dict
import numpy as np

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict
import numpy as np

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
5 changes: 2 additions & 3 deletions meltingpot/configs/substrates/commons_harvest__open.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,11 @@

from typing import Any, Dict, Mapping, Sequence

from ml_collections import config_dict
import numpy as np

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict
import numpy as np

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
5 changes: 2 additions & 3 deletions meltingpot/configs/substrates/commons_harvest__partnership.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@

from typing import Any, Dict, Mapping, Sequence

from ml_collections import config_dict
import numpy as np

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict
import numpy as np

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
3 changes: 1 addition & 2 deletions meltingpot/configs/substrates/coop_mining.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,10 @@
from collections.abc import Mapping, Sequence
from typing import Any

from ml_collections import config_dict

from meltingpot.utils.substrates import colors
from meltingpot.utils.substrates import shapes
from meltingpot.utils.substrates import specs
from ml_collections import config_dict

# Warning: setting `_ENABLE_DEBUG_OBSERVATIONS = True` may cause slowdown.
_ENABLE_DEBUG_OBSERVATIONS = False
Expand Down
Loading

0 comments on commit 053a0e2

Please sign in to comment.