Fix data files include in pyproject. Fix env.unwrapped warning

amacati · Dec 6, 2023 · 88c47ea · 88c47ea
1 parent fdd9bb7
commit 88c47ea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,16 +42,16 @@ Homepage = "https://github.com/amacati/SoulsGym"
 Documentation = "https://soulsgym.readthedocs.io/en/latest/"
 Repository = "https://github.com/amacati/SoulsGym"
 
-[tool.setuptools.packages]
-find = {}
-
+[tool.setuptools.packages.find]
+namespaces = true
 
 [tool.setuptools.package-data]
 soulsgym = [
-    "soulsgym/core/data/**/*.yaml",
-    "soulsgym/core/speedhack/_C/*.dll",
-    "soulsgym/core/game_window/_C/window_capture.pyd",
-    "soulsgym/envs/config/*.yaml",
+    "core/data/darksouls3/*.yaml",
+    "core/data/eldenring/*.yaml",
+    "core/speedhack/_C/*.dll",
+    "core/game_window/_C/window_capture.pyd",
+    "envs/config/*.yaml",
 ]
 
 [tool.yapf]

diff --git a/soulsgym/core/utils.py b/soulsgym/core/utils.py
@@ -1,5 +1,6 @@
 """Utility module for ``soulsgym``."""
 from __future__ import annotations
+
 from typing import Union, Any
 from threading import Lock
 from weakref import WeakValueDictionary

diff --git a/tests/darksouls3/integration_tests/test_envs.py b/tests/darksouls3/integration_tests/test_envs.py
@@ -30,7 +30,7 @@ def run_env(env_name: str, kwargs: dict | None = None):
             _, _, terminated, truncated, _ = env.step(env.action_space.sample())
     finally:
         env.close()
-        env.game.reload()
+        env.unwrapped.game.reload()
 
 
 @pytest.mark.integration