Skip to content

Commit 9bf86f3

Browse files
ojasjoshiojasjosh
andauthored
Update world installation to use python3 (#11)
* Update world installation to use python3 * Update README.md Co-authored-by: ojasjosh <ojasjosh@amazon.com>
1 parent c7c5698 commit 9bf86f3

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
55
gazebo_ros
66
)
77

8-
exec_program("pip3 install -r ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt")
8+
exec_program("python3 -m pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/requirements.txt")
99
exec_program("python3 ${CMAKE_CURRENT_SOURCE_DIR}/fuel_utility.py download -m XRayMachine -m IVStand -m BloodPressureMonitor -m BPCart -m BMWCart -m CGMClassic -m StorageRack -m Chair -m InstrumentCart1 -m Scrubs -m PatientWheelChair -m WhiteChipChair -m TrolleyBed -m SurgicalTrolley -m PotatoChipChair -m VisitorKidSit -m FemaleVisitorSit -m AdjTable -m MopCart3 -m MaleVisitorSit -m Drawer -m OfficeChairBlack -m ElderLadyPatient -m ElderMalePatient -m InstrumentCart2 -m MetalCabinet -m BedTable -m BedsideTable -m AnesthesiaMachine -m TrolleyBedPatient -m Shower -m SurgicalTrolleyMed -m StorageRackCovered -m KitchenSink -m Toilet -m VendingMachine -m ParkingTrolleyMin -m PatientFSit -m MaleVisitorOnPhone -m FemaleVisitor -m MalePatientBed -m StorageRackCoverOpen -m ParkingTrolleyMax -d ${CMAKE_CURRENT_SOURCE_DIR}/fuel_models --verbose")
1010

1111
catkin_package()

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
![Model: Hospital World](docs/images/hospital_world.jpg)
66
### Supported versions of Gazebo
7-
7.14.0+ | 9.16.0+
8-
7+
7.14.0+ | 9.16.0+
98

9+
Note: `python3` and `python3-pip` is required to run this world.
1010

1111
## 3D Models included in this Gazebo World
1212

@@ -24,6 +24,7 @@ We also reference the following models from https://app.ignitionrobotics.org/fue
2424

2525
*XRayMachine, IVStand, BloodPressureMonitor, BPCart, BMWCart, CGMClassic, StorageRack, Chair, InstrumentCart1, Scrubs, PatientWheelChair, WhiteChipChair, TrolleyBed, SurgicalTrolley, PotatoChipChair, VisitorKidSit, FemaleVisitorSit, AdjTable, MopCart3, MaleVisitorSit, Drawer, OfficeChairBlack, ElderLadyPatient, ElderMalePatient, InstrumentCart2, MetalCabinet, BedTable, BedsideTable, AnesthesiaMachine, TrolleyBedPatient, Shower, SurgicalTrolleyMed, StorageRackCovered, KitchenSink, Toilet, VendingMachine, ParkingTrolleyMin, PatientFSit, MaleVisitorOnPhone, FemaleVisitor, MalePatientBed, StorageRackCoverOpen, ParkingTrolleyMax*
2626

27+
2728
# Include the world from another package
2829

2930
* Update .rosinstall to clone this repository and run `rosws update`

setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
pip install -r requirements.txt
2+
python3 -m pip install -r requirements.txt
33
python3 fuel_utility.py download \
44
-m XRayMachine -m IVStand -m BloodPressureMonitor -m BPCart -m BMWCart \
55
-m CGMClassic -m StorageRack -m Chair \

0 commit comments

Comments
 (0)