Skip to content

Commit 4e15bc2

Browse files
committed
fix: refactored requirements_dev.txt in makefiles
1 parent a251279 commit 4e15bc2

7 files changed

Lines changed: 6 additions & 10 deletions

File tree

.github/workflows/py.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
python-version: "3.10"
2222
cache: "pip"
2323
- name: Install linting and formatting dependencies
24-
run: python -m pip install -r requirements_dev.txt
24+
run: python -m pip install -r requirements.txt
2525
- name: Check formatting
2626
run: make pycheckformat
2727

@@ -43,7 +43,7 @@ jobs:
4343
python-version: "3.11"
4444
cache: "pip"
4545
- name: Install building dependencies
46-
run: python -m pip install -r requirements_dev.txt
46+
run: python -m pip install -r requirements.txt
4747
- name: Install wheel
4848
run: python -m pip install wheel
4949
- name: Install the package

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ cpplint:
1616
# clang-tidy -p=build --warnings-as-errors='*' $(shell find extensions/rcs_fr3/src -name '*.cpp' -o -name '*.cc' -name '*.h')
1717

1818
gcccompile:
19-
pip install --upgrade --requirement requirements_dev.txt
2019
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -B build -G Ninja $(if ${PYTHON_EXECUTABLE},-DPython3_EXECUTABLE=${PYTHON_EXECUTABLE})
2120
cmake --build build --target _core
2221

2322
clangcompile:
24-
pip install --upgrade --requirement requirements_dev.txt
2523
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -G Ninja $(if ${PYTHON_EXECUTABLE},-DPython3_EXECUTABLE=${PYTHON_EXECUTABLE})
2624
cmake --build build --target _core
2725

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
**Robot Control Stack (RCS)** is a unified and multilayered robot control interface over a MuJoCo simulation and real world robot currently implemented for the FR3/Panda, xArm7, UR5e and SO101.
44

5+
![rcs architecture diagram](docs/_static/rcs_architecture_small.svg)
6+
57
## Installation
68

79
We build and test RCS on the latest Debian and on the latest Ubuntu LTS.

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ RUN pip install --upgrade pip setuptools
7575
RUN pip config --site set global.no-build-isolation false
7676

7777
# Install development dependencies
78-
RUN pip install -r requirements_dev.txt
78+
RUN pip install -r requirements.txt
7979

8080
# Install the package in editable mode (CMake + pybind11 + scikit-build-core triggered)
8181
RUN pip install -e . --no-cache-dir --verbose --no-build-isolation

extensions/rcs_robotics_library/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ cpplint:
1616
# clang-tidy -p=build --warnings-as-errors='*' $(shell find extensions/rcs_fr3/src -name '*.cpp' -o -name '*.cc' -name '*.h')
1717

1818
gcccompile:
19-
pip install --upgrade --requirement requirements_dev.txt
2019
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -B build -G Ninja
2120
cmake --build build --target _core
2221

2322
clangcompile:
24-
pip install --upgrade --requirement requirements_dev.txt
2523
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -G Ninja
2624
cmake --build build --target _core
2725

extensions/rcs_so101/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ cpplint:
1616
# clang-tidy -p=build --warnings-as-errors='*' $(shell find extensions/rcs_fr3/src -name '*.cpp' -o -name '*.cc' -name '*.h')
1717

1818
gcccompile:
19-
pip install --upgrade --requirement requirements_dev.txt
2019
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -B build -G Ninja
2120
cmake --build build --target _core
2221

2322
clangcompile:
24-
pip install --upgrade --requirement requirements_dev.txt
2523
cmake -DCMAKE_BUILD_TYPE=${COMPILE_MODE} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -G Ninja
2624
cmake --build build --target _core
2725

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies = ["websockets>=11.0",
1919
"pillow~=10.3",
2020
"python-dotenv==1.0.1",
2121
"opencv-python~=4.10.0.84",
22-
# NOTE: when changing the mujoco version, also change it in requirements_dev.txt
22+
# NOTE: when changing the mujoco version, also change it in requirements.txt
2323
"mujoco==3.2.6",
2424
# NOTE: Same for pinocchio (pin)
2525
"pin==3.7.0",

0 commit comments

Comments
 (0)