Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[devel]→[master] Preparation of v1.3.0 #361

Merged
merged 161 commits into from
Oct 4, 2021
Merged
Show file tree
Hide file tree
Changes from 78 commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
37f1b3b
Merge branch 'master' into devel
diegoferigo Apr 1, 2021
384d297
Update CMake to find Ignition Edifice
diegoferigo Mar 26, 2021
347394b
Use Ignition Edifice in CI for the nightly channel
diegoferigo Mar 26, 2021
67a64bd
Fix installing Ignition dependencies when built from sources
diegoferigo Mar 26, 2021
58ccc0c
Update documentation
diegoferigo Apr 1, 2021
eee866d
Use interactive bash session also when calling pytest
diegoferigo Mar 26, 2021
b5db6d3
Merge pull request #307 from robotology/feature/edifice
diegoferigo Apr 1, 2021
edf5df5
Merge branch 'master' into devel
diegoferigo Apr 12, 2021
fd93ac5
Align Physics system (#318)
diegoferigo Apr 27, 2021
e79aff5
Address sdformat11 deprecation warnings
diegoferigo Apr 1, 2021
38c513f
Update test_world.py
diegoferigo Apr 1, 2021
ae352eb
Configure the physics parameters through the PhysicsCmd component
diegoferigo Apr 27, 2021
366ae3a
Print active physics parameters of World object
diegoferigo Apr 5, 2021
06bc00f
After initialization, read world physics parameters from the ECM
diegoferigo Apr 27, 2021
84d49bd
Update default world
diegoferigo Apr 6, 2021
e7555e2
Update documentation
diegoferigo Apr 6, 2021
f3e72b0
Merge pull request #321 from robotology/fix/edifice_deprecations
diegoferigo Apr 28, 2021
159bb15
Merge pull request #335 from robotology/feature/physics_params
diegoferigo Apr 28, 2021
9394833
Merge pull request #336 from robotology/update_default_world
diegoferigo Apr 28, 2021
8212df7
Prepare multiple physics engines support
diegoferigo Apr 6, 2021
fe227b5
Merge pull request #338 from robotology/feature/prepare_multiple_phys…
diegoferigo Apr 28, 2021
4c2fb3b
Merge branch 'master' into devel
diegoferigo Apr 28, 2021
19f6574
Update logic of contact detection
diegoferigo Apr 28, 2021
9b64910
Merge pull request #334 from robotology/feature/optimize_contact_dete…
diegoferigo Apr 28, 2021
1454d8e
Move inheritance from ModelWithFile to ICubGazeboABC
diegoferigo Apr 29, 2021
c6d6767
Merge pull request #342 from robotology/fix/move_model_with_file_inhe…
diegoferigo Apr 29, 2021
ac7c0b9
Allow specifying different verbosity for gym-ignition and ScenarIO
diegoferigo Apr 29, 2021
c687b47
Set sane default verbosity
diegoferigo Apr 29, 2021
1c5be0b
Improve logging messages of gym-ignition
diegoferigo Apr 29, 2021
9107aaf
Improve GUI log verbosity
diegoferigo May 6, 2021
762f1ea
Merge pull request #343 from robotology/feature/configure_default_ver…
diegoferigo May 6, 2021
bc683a6
Add new utils function insertPluginToGazeboEntity
diegoferigo May 6, 2021
c0f2f5c
Update SWIG bindings
diegoferigo May 6, 2021
8737b65
Replace world and model logic with the new utils function
diegoferigo May 6, 2021
45135fa
Add new Joint::insertJointPlugin method
diegoferigo May 6, 2021
c617108
Add new Link::insertLinkPlugin method
diegoferigo May 6, 2021
ed4c557
Merge pull request #345 from robotology/feature/unify_plugin_loading
diegoferigo May 6, 2021
0c76cff
Remove debug message
diegoferigo May 6, 2021
93feef9
Minor cleanup
diegoferigo May 6, 2021
2318587
Move cpp/scenario/ to scenario/
diegoferigo May 6, 2021
21621bb
Update main CMakeLists.txt
diegoferigo May 6, 2021
6d3b885
Update gitignore
diegoferigo May 6, 2021
4912584
Split setup.py for gym-ignition and scenario
diegoferigo May 21, 2021
94136ad
Update docker images
diegoferigo May 7, 2021
544e51f
Refactor CI/CD pipeline
diegoferigo May 21, 2021
f75fcbc
Include website to CI/CD workflow
diegoferigo May 7, 2021
f75998a
Add ScenarIO README
diegoferigo May 21, 2021
b460d05
Fix website generation
diegoferigo May 9, 2021
0f1b17b
Make sure that SWIG targets exist before generating the website
diegoferigo May 9, 2021
de29a45
Retain website artifact for the minimum period
diegoferigo May 10, 2021
9c95784
Update gym-ignition README
diegoferigo May 21, 2021
27698c3
Move ScenarIO files into scenario folder
diegoferigo May 21, 2021
37c4fa0
Update website
diegoferigo May 21, 2021
4e5e69e
Update theme configuration
diegoferigo May 21, 2021
1f88213
Merge pull request #346 from robotology/feature/split_scenario
diegoferigo May 22, 2021
df427c8
Fix include directory in swig target by reordering linked libs
diegoferigo May 13, 2021
bc832dc
Fix Python type hinting: std::vector is always mapped to tuple
diegoferigo May 13, 2021
b2ab33c
Merge pull request #358 from robotology/fix/includes_in_swig
diegoferigo May 22, 2021
ad815c9
Merge pull request #357 from robotology/fix/type_hinting
diegoferigo May 22, 2021
e6be257
Update ScenarIO badges
diegoferigo May 22, 2021
d58771a
Fix docker images
diegoferigo May 22, 2021
76ebcfc
Add core methods to set joint velocity limits
diegoferigo May 13, 2021
ee07cf8
Implement joint velocity limits for Gazebo
diegoferigo May 13, 2021
565adc8
Merge pull request #356 from robotology/feature/velocity_limit
diegoferigo May 24, 2021
eeb520e
Update vendored FindPython resources to CMake 3.20.2
diegoferigo May 24, 2021
841ec20
Merge pull request #360 from robotology/feature/update_vendored_findp…
diegoferigo May 24, 2021
7b5e0aa
Update gym_ignition resources
diegoferigo Jun 29, 2021
f37e4ad
Update scenario resources
diegoferigo Jun 29, 2021
8c362a1
Update CI/CD pipeline
diegoferigo Jun 29, 2021
6697f69
Merge pull request #364 from robotology/feature/setup.cfg
diegoferigo Jun 30, 2021
ed3e135
Align Physics system (Edifice 5.1) (#365)
diegoferigo Jun 30, 2021
3d5fde8
Merge branch 'master' into devel
diegoferigo Jun 30, 2021
d260ad4
Update vendored FindPython3 to CMake 3.20.5
diegoferigo Jul 1, 2021
7880882
Add helper class to insert a Sphere
diegoferigo Jul 1, 2021
4b09710
Test a multi-world simulation with DART and bullet collision detector
diegoferigo Jul 1, 2021
d69e492
Merge pull request #367 from robotology/feature/findpython3
diegoferigo Jul 1, 2021
2d0cc67
Merge pull request #368 from robotology/feature/collision_detector_test
diegoferigo Jul 1, 2021
fcf705e
Add missing url to feature request template
diegoferigo Jul 1, 2021
96e1ce0
Use the versioned name of the physics plugin
diegoferigo Jul 2, 2021
a369321
Merge pull request #369 from robotology/fix/ignition-physics-plugin-name
diegoferigo Jul 2, 2021
027f0a4
Mark the DART + bullet collision detector test as flaky
diegoferigo Jul 2, 2021
7b37e44
Disable test_multi_world_simulation
diegoferigo Jul 21, 2021
09614bd
Merge pull request #374 from robotology/feature/disable_test
diegoferigo Jul 21, 2021
58adbaf
Add Code Style workflow with clang-format job
diegoferigo Jul 21, 2021
f8190dd
Update the PyPi name to scenario
diegoferigo Jul 21, 2021
4acaa9f
Update README with new scenario PyPI package
diegoferigo Jul 21, 2021
1506eff
Update website with new scenario PyPI package
diegoferigo Jul 21, 2021
3dd4959
Update CI/CD pipeline with new scenario PyPI package
diegoferigo Jul 21, 2021
cf10032
Merge pull request #373 from robotology/feature/scenario_pypi
diegoferigo Jul 21, 2021
50a9662
Merge pull request #375 from robotology/feature/ci_clang_format
diegoferigo Jul 21, 2021
41ad594
Vendor Physics system
diegoferigo Jul 27, 2021
17fca92
Revert upstream PR 690
diegoferigo Jun 30, 2021
36eb5d0
Custom Physics features
diegoferigo Jul 21, 2021
e04116e
Merge pull request #376 from robotology/feature/align_physics
diegoferigo Jul 28, 2021
4b1ef4e
Add black and isort configuration
diegoferigo Jul 28, 2021
7c1b8ae
Format gym_ignition.base
diegoferigo Jul 28, 2021
ae125c8
Format gym_ignition.context
diegoferigo Jul 28, 2021
05312e5
Format gym_ignition.randomizers
diegoferigo Jul 28, 2021
1b67e52
Format gym_ignition.rbd
diegoferigo Jul 28, 2021
55b132e
Format gym_ignition.runtimes
diegoferigo Jul 28, 2021
9e4bd34
Format gym_ignition.scenario
diegoferigo Jul 28, 2021
a103120
Format gym_ignition.utils
diegoferigo Jul 28, 2021
31a317f
Format gym_ignition.__init__
diegoferigo Jul 28, 2021
dfff9e3
Format scenario.__init__
diegoferigo Jul 28, 2021
d1d97fb
Format gym_ignition_environments.__init__
diegoferigo Jul 28, 2021
ba2e282
Format gym_ignition_environments.models
diegoferigo Jul 28, 2021
5f40972
Format gym_ignition_environments.randomizers
diegoferigo Jul 28, 2021
99e100c
Format gym_ignition_environments.tasks
diegoferigo Jul 28, 2021
e6d92f8
Format tests
diegoferigo Jul 28, 2021
5d427ec
Enable tests disabled by mistake
diegoferigo Jul 28, 2021
68de271
Format sphinx configuration
diegoferigo Jul 28, 2021
7ee25ea
Format examples
diegoferigo Jul 28, 2021
19874f6
Add black CI check
diegoferigo Jul 28, 2021
5b85250
Add isort CI check
diegoferigo Jul 28, 2021
612c52a
Fix circular imports
diegoferigo Jul 28, 2021
633f2f5
Merge pull request #377 from robotology/feature/black_isort
diegoferigo Jul 28, 2021
56e3caa
Remove ECMSingleton and ECMProvider
diegoferigo Aug 2, 2021
6f3cad9
Use a private System to get the pointers to the ECM and EventManager
diegoferigo Aug 2, 2021
0dfd988
Update bindings
diegoferigo Aug 2, 2021
6471ddf
Update logic to get the world name in gym_ignition
diegoferigo Aug 2, 2021
450bbf4
Merge pull request #379 from robotology/feature/remove_ecm_provider
diegoferigo Aug 24, 2021
ae008a9
Create CODEOWNERS
diegoferigo Aug 24, 2021
bf3505b
Use main branch of gh-action-clang-format
diegoferigo Aug 25, 2021
f032f89
Merge pull request #380 from robotology/diegoferigo-patch-1
diegoferigo Aug 25, 2021
7f479b4
Fix leftover after removing ScenarioGazeboPlugins CMake component
diegoferigo Aug 30, 2021
efeeb15
Merge pull request #382 from robotology/fix/removed_component
diegoferigo Aug 31, 2021
a822d42
Fix test_velocity_direct
diegoferigo Sep 14, 2021
932983b
Merge pull request #387 from robotology/fix/test_velocity_direct
diegoferigo Sep 15, 2021
2d55379
Disable joint velocity limits in the manipulation example
diegoferigo Sep 13, 2021
8119705
Update documentation
diegoferigo Sep 13, 2021
6975b42
Add new core::World::models method
diegoferigo Sep 14, 2021
9da5094
Implement gazebo::World::models method
diegoferigo Sep 14, 2021
b7984f8
Create resources if a world file contains any model
diegoferigo Sep 14, 2021
cd08628
Allow specifying different pos and rot weights for POSE IK targets
diegoferigo Sep 15, 2021
9a7a499
Update logic of default weight for pose targets
diegoferigo Sep 15, 2021
230fd1a
Merge pull request #386 from robotology/fix/insert_world_with_models
diegoferigo Sep 15, 2021
903011c
Merge pull request #384 from robotology/diegoferigo-patch-1
diegoferigo Sep 15, 2021
e1626cf
Preserve backward compatibility of POSE targets
diegoferigo Sep 15, 2021
83b9b1c
Merge pull request #388 from robotology/fix/ik_pose_weights
diegoferigo Sep 15, 2021
0b99512
Update logic of external wrench application
diegoferigo Sep 14, 2021
92131eb
Add test
diegoferigo Sep 14, 2021
2e83839
Merge pull request #391 from robotology/feature/improve_ext_wrench_ap…
diegoferigo Sep 28, 2021
d0e3533
Add Ignition Fortress support
diegoferigo Sep 10, 2021
d1c41cc
Update CI/CD pipeline
diegoferigo Sep 10, 2021
982193a
Update docker images
diegoferigo Sep 10, 2021
795b6ce
Remove assert using removed method
diegoferigo Sep 10, 2021
15d8b9a
Update documentation
diegoferigo Sep 10, 2021
7608b5c
Fix tests
diegoferigo Sep 28, 2021
f974456
Merge pull request #383 from robotology/feature/fortress
diegoferigo Sep 29, 2021
c20827b
Align Physics system (#392)
diegoferigo Sep 29, 2021
7aad6cc
Minor cleanup of GazeboSimulator
diegoferigo Sep 15, 2021
f1864af
Use upstream method to check canonical link
diegoferigo Sep 15, 2021
17fafe5
Get data by const reference
diegoferigo Sep 29, 2021
871407d
Merge pull request #395 from robotology/cleanup
diegoferigo Sep 29, 2021
7d74257
Fix codacy warning
diegoferigo Oct 2, 2021
638cb98
Check the installed Ignition version from the command line
diegoferigo Oct 2, 2021
9c1ab6c
Add the 'packaging' dependency
diegoferigo Oct 2, 2021
ac0b447
Fix positivity option of model randomizations
diegoferigo Oct 3, 2021
71bc86f
Merge pull request #399 from robotology/feature/check_version
diegoferigo Oct 3, 2021
1b1ed90
Merge pull request #400 from robotology/fix/force_positive_sdf_random…
diegoferigo Oct 3, 2021
7d986ab
Update supported Ignition distribution of stable channel
diegoferigo Oct 3, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
ARG from=diegoferigo/gym-ignition:pypi-master
FROM ${from}

# Source /etc/bash.bashrc before each command
SHELL ["/bin/bash", "-i", "-c"]

# Install the PyPI package in a virtualenv
ARG pip_options=""
RUN virtualenv -p $(which python3) ${VIRTUAL_ENV} &&\
python -m pip install --upgrade pip &&\
pip install ${pip_options} gym-ignition &&\
rm -r $HOME/.cache/pip

Expand All @@ -15,5 +13,7 @@ WORKDIR /github
ARG branch="master"
RUN git clone -b ${branch} https://github.com/robotology/gym-ignition /github

CMD ["bash"]
# Reset the entrypoint
ENTRYPOINT [""]

CMD ["bash"]
17 changes: 0 additions & 17 deletions .docker/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,4 @@ RUN add-apt-repository ppa:git-core/ppa &&\
ENV VIRTUAL_ENV=/venv
ENV PATH=$VIRTUAL_ENV/bin:$PATH

# Install iDynTree
RUN apt-get update &&\
apt-get install -y --no-install-recommends \
python3-numpy libxml2-dev coinor-libipopt-dev libeigen3-dev &&\
rm -rf /var/lib/apt/lists/* &&\
git clone --depth 1 -b devel https://github.com/robotology/idyntree /tmp/idyntree &&\
mkdir -p /tmp/idyntree/build && cd /tmp/idyntree/build &&\
cmake .. \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS:BOOL=OFF \
-DIDYNTREE_USES_PYTHON=True \
-DIDYNTREE_USES_IPOPT:BOOL=ON \
&&\
cmake --build . --target install &&\
rm -r /tmp/idyntree

CMD ["bash"]
76 changes: 14 additions & 62 deletions .docker/cicd-devel.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,76 +1,24 @@
ARG from=diegoferigo/gym-ignition:base
FROM ${from}

ARG IGNITION_DEFAULT_CHANNEL="stable"
RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-${IGNITION_DEFAULT_CHANNEL} `lsb_release -cs` main" > \
/etc/apt/sources.list.d/gazebo-${IGNITION_DEFAULT_CHANNEL}.list &&\
wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add - &&\
apt-get update &&\
apt-get install -y --no-install-recommends \
cmake \
freeglut3-dev \
libavcodec-dev \
libavdevice-dev \
libavformat-dev \
libavutil-dev \
libbenchmark-dev \
libcurl4-openssl-dev \
libfreeimage-dev \
libgflags-dev \
libglew-dev \
libgts-dev \
libjsoncpp-dev \
libogre-1.9-dev \
libogre-2.1-dev \
libprotobuf-dev \
libprotoc-dev \
libqt5core5a \
libsqlite3-dev \
libswscale-dev \
libtinyxml-dev \
libtinyxml2-dev \
libwebsockets-dev \
libyaml-dev \
libzip-dev \
libzmq3-dev \
pkg-config \
protobuf-compiler \
python \
qml-module-qt-labs-folderlistmodel \
qml-module-qt-labs-settings \
qml-module-qtqml-models2 \
qml-module-qtquick-controls \
qml-module-qtquick-controls2 \
qml-module-qtquick-dialogs \
qml-module-qtquick-layouts \
qml-module-qtquick2 \
qtbase5-dev \
qtdeclarative5-dev \
qtquickcontrols2-5-dev \
ruby \
ruby-dev \
ruby-ronn \
swig \
uuid-dev \
# Additional
libdart-collision-ode-dev \
libdart-dev \
libdart-external-ikfast-dev \
libdart-external-odelcpsolver-dev \
libdart-utils-urdf-dev \
&&\
rm -rf /var/lib/apt/lists/*

RUN pip3 install vcstool colcon-common-extensions &&\
rm -r $HOME/.cache/pip

ARG CMAKE_BUILD_TYPE="Release"
ARG ignition_codename="citadel"
ARG ignition_codename="edifice"
ARG IGNITION_DEFAULT_CHANNEL="stable"

RUN mkdir -p /workspace/src &&\
RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-${IGNITION_DEFAULT_CHANNEL} `lsb_release -cs` main" > \
/etc/apt/sources.list.d/gazebo-${IGNITION_DEFAULT_CHANNEL}.list &&\
wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add - &&\
apt-get update &&\
mkdir -p /workspace/src &&\
cd /workspace/src &&\
wget https://raw.githubusercontent.com/ignition-tooling/gazebodistro/master/collection-${ignition_codename}.yaml &&\
vcs import < collection-${ignition_codename}.yaml &&\
apt -y install --no-install-recommends \
$(sort -u $(find . -iname 'packages-'$(lsb_release -cs)'.apt' -o -iname 'packages.apt') | grep -v -E "dart|^libignition|^libsdformat" | tr '\n' ' ') &&\
rm -rf /var/lib/apt/lists/* &&\
cd /workspace &&\
colcon graph &&\
colcon build \
Expand All @@ -80,8 +28,12 @@ RUN mkdir -p /workspace/src &&\
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
--merge-install \
&&\
find build/ -type f -not -name 'CMakeCache.txt' -delete &&\
echo "source /workspace/install/setup.bash" >> /etc/bash.bashrc

# Source /etc/bash.bashrc before each command
SHELL ["/bin/bash", "-i", "-c"]

COPY entrypoint.sh /entrypoint.sh
COPY setup_virtualenv.sh /setup_virtualenv.sh
RUN chmod 755 /entrypoint.sh
Expand Down
2 changes: 1 addition & 1 deletion .docker/cicd-master.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG from=diegoferigo/gym-ignition:base
FROM ${from}

# Install ignition gazebo
ARG ignition_codename="citadel"
ARG ignition_codename="edifice"
RUN echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" \
> /etc/apt/sources.list.d/gazebo-stable.list &&\
wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add - &&\
Expand Down
4 changes: 2 additions & 2 deletions .docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ services:
build:
args:
from: diegoferigo/gym-ignition:base
ignition_codename: dome
ignition_codename: edifice
CMAKE_BUILD_TYPE: Debug
context: .
dockerfile: cicd-devel.Dockerfile
Expand All @@ -50,7 +50,7 @@ services:
build:
args:
from: diegoferigo/gym-ignition:base
ignition_codename: dome
ignition_codename: edifice
CMAKE_BUILD_TYPE: Release
context: .
dockerfile: cicd-devel.Dockerfile
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ labels: issue::type::enhancement

<!-- Remove this warning before posting the issue -->

⚠️ If you're not sure on the specifics of the feature or would like a broader discussion,
please consider posting a proposal to [Discussions][Discussions] instead.
⚠️ If you're not sure on the specifics of the feature or would like a broader discussion, please consider posting a proposal to [Discussions][Discussions] instead.

[Discussions]: https://github.com/robotology/gym-ignition/discussions

## Summary

Describe what this new feature is about and the context you would find it useful.

## Implementation suggestion

Provide a suggestion on how to implement this feature, which could help us
to speed up the implementation.
Provide a suggestion on how to implement this feature, which could help us to speed up the implementation.

## Additional context

Expand Down
Loading