Skip to content

Commit 08fa4d1

Browse files
committed
Simplify dependencies
1 parent c03a60e commit 08fa4d1

File tree

8 files changed

+13
-44
lines changed

8 files changed

+13
-44
lines changed

.github/workflows/ci.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,11 @@ jobs:
4040
4141
# cpu version of pytorch - faster to download
4242
pip install torch==2.1.0 --index-url https://download.pytorch.org/whl/cpu
43-
pip install pybullet==3.2.5
44-
# for v4 MuJoCo envs:
45-
pip install mujoco
43+
4644
pip install -r requirements.txt
4745
# Use headless version
4846
pip install opencv-python-headless
49-
# install parking-env to test HER
50-
pip install highway-env==1.8.1
51-
pip install -e .
47+
pip install -e .[plots,tests]
5248
- name: Lint with ruff
5349
run: |
5450
make lint

.github/workflows/trained_agents.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ jobs:
4141
4242
# cpu version of pytorch - faster to download
4343
pip install torch==2.1.0 --index-url https://download.pytorch.org/whl/cpu
44-
pip install pybullet==3.2.5
4544
pip install -r requirements.txt
4645
# Use headless version
4746
pip install opencv-python-headless
48-
pip install highway-env==1.8.1
49-
pip install -e .
47+
pip install -e .[plots,tests]
5048
- name: Check trained agents
5149
run: |
5250
make check-trained-agents

CHANGELOG.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99

1010

1111
### Bug fixes
12-
- Added test dependencies to `setup.py` (@power-edge)
1312

1413
### Documentation
15-
- Added README to tests
1614

1715
### Other
18-
16+
- Added test dependencies to `setup.py` (@power-edge)
17+
- Simplify dependencies of `requirements.txt` (remove duplicates from `setup.py`)
1918

2019

2120
## Release 2.2.1 (2023-11-17)

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Note: you can do `python -m rl_zoo3.train` from any folder and you have access t
5252
```
5353
apt-get install swig cmake ffmpeg
5454
pip install -r requirements.txt
55+
pip install -e .[plots,tests]
5556
```
5657

5758
Please see [Stable Baselines3 documentation](https://stable-baselines3.readthedocs.io/en/master/) for alternatives to install stable baselines3.

docs/guide/install.rst

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ With extra envs and test dependencies:
4848
4949
apt-get install swig cmake ffmpeg
5050
pip install -r requirements.txt
51+
pip install -e .[plots,tests]
5152
5253
5354
Please see `Stable Baselines3 documentation <https://stable-baselines3.readthedocs.io/en/master/>`_ for alternatives to install stable baselines3.

requirements.txt

+1-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
gym==0.26.2
22
stable-baselines3[extra_no_roms,tests,docs]>=2.3.0a1,<3.0
3-
sb3-contrib>=2.3.0a1,<3.0
43
box2d-py==2.3.8
5-
pybullet
64
pybullet_envs_gymnasium>=0.4.0
75
# minigrid
8-
# scikit-optimize
9-
optuna~=3.0
10-
pyyaml>=5.1
116
cloudpickle>=2.2.1
7+
# optuna plots:
128
plotly
139
# need to upgrade to gymnasium:
1410
# panda-gym~=3.0.1
15-
rliable>=1.0.5
1611
wandb
17-
huggingface_sb3>=3.0,<4.0
18-
seaborn
19-
tqdm
20-
rich
2112
moviepy
22-
ruff

setup.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
]
2727
plots_requires = ["seaborn", "rliable>=1.0.5", "scipy~=1.10"]
2828
test_requires = [
29-
"pytest",
30-
"pytablewriter",
31-
"gymnasium[mujoco]",
32-
"minigrid",
29+
# for MuJoCo envs v4:
30+
"mujoco~=2.3",
31+
# install parking-env to test HER
32+
"highway-env==1.8.2",
3333
]
3434

3535
setup(
@@ -44,7 +44,7 @@
4444
},
4545
entry_points={"console_scripts": ["rl_zoo3=rl_zoo3.cli:main"]},
4646
install_requires=install_requires,
47-
extras_require={"plots": plots_requires, "test": test_requires},
47+
extras_require={"plots": plots_requires, "tests": test_requires},
4848
description="A Training Framework for Stable Baselines3 Reinforcement Learning Agents",
4949
author="Antonin Raffin",
5050
url="https://github.com/DLR-RM/rl-baselines3-zoo",

tests/README.md

-16
This file was deleted.

0 commit comments

Comments
 (0)