Fixed requirements, updated imports

f1tenth · Aug 23, 2023 · 1a2a5c9 · 1a2a5c9
1 parent 6fbd313
commit 1a2a5c9
Show file tree

Hide file tree

Showing 10 changed files with 359 additions and 333 deletions.
diff --git a/Pipfile b/Pipfile
@@ -11,13 +11,12 @@ scipy = ">=1.7.3"
 pyglet = "<1.5"
 pyyaml = ">=5.3.1"
 yamldataclassconfig = "*"
-matplotlib = "*"
 requests = "*"
 pyopengl = "*"
 numba = "*"
-f110-gym = {file = "."}
 shapely = "*"
 opencv-python = "*"
+f110-gym = {file = "."}
 
 [dev-packages]
 flake8 = "*"
@@ -26,6 +25,7 @@ ipykernel = "*"
 pytest = "*"
 isort = "*"
 autoflake = "*"
+matplotlib = "*"
 
 [requires]
 python_version = "3.10"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/gym/f110_gym/envs/__init__.py b/gym/f110_gym/envs/__init__.py
@@ -0,0 +1 @@
+from .f110_env import F110Env
diff --git a/gym/f110_gym/envs/base_classes.py b/gym/f110_gym/envs/base_classes.py
@@ -27,7 +27,7 @@
 Author: Hongrui Zheng
 """
 import numpy as np
-from f110_gym.envs import DynamicModel
+from f110_gym.envs.dynamic_models import DynamicModel
 from f110_gym.envs.action import CarAction
 from f110_gym.envs.collision_models import collision_multiple, get_vertices
 from f110_gym.envs.integrator import EulerIntegrator, IntegratorType

diff --git a/gym/f110_gym/envs/f110_env.py b/gym/f110_gym/envs/f110_env.py
@@ -32,7 +32,7 @@
 import numpy as np
 # gl
 import pyglet
-from f110_gym.envs import IntegratorType
+from f110_gym.envs.integrator import IntegratorType
 from f110_gym.envs.action import (CarActionEnum,
                                   from_single_to_multi_action_space)
 # base classes

diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.cfg b/setup.cfg
@@ -1,4 +1,4 @@
-[pytest]
+[tool:pytest]
 minversion = 6.0
 addopts = -ra -q
 testpaths =

diff --git a/setup.py b/setup.py
@@ -18,5 +18,18 @@
         "pyopengl",
         "yamldataclassconfig",
         "requests",
+        "shapely",
+        "opencv-python",
     ],
+    extras_require={
+        'dev': [
+            'pytest',
+            'flake8',
+            'black',
+            'ipykernel',
+            'isort',
+            'autoflake',
+            'matplotlib'
+        ]
+    }
 )
diff --git a/tests/test_dynamics.py b/tests/test_dynamics.py
@@ -23,7 +23,7 @@
 import unittest
 
 import numpy as np
-from f110_gym.envs import vehicle_dynamics_ks, vehicle_dynamics_st
+from f110_gym.envs.dynamic_models import vehicle_dynamics_ks, vehicle_dynamics_st
 
 
 def func_KS(

diff --git a/tests/test_scan_sim.py b/tests/test_scan_sim.py
@@ -29,7 +29,7 @@
 import unittest
 
 import numpy as np
-from f110_gym.envs import ScanSimulator2D
+from f110_gym.envs.laser_models import ScanSimulator2D
 from numba import njit
 from scipy.ndimage import distance_transform_edt as edt