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

Draft: v2.1.0 #364

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

Draft: v2.1.0 #364

wants to merge 25 commits into from

Conversation

hwiedPro
Copy link
Collaborator

Description

Python Module:

  • ci:
    - Support for Azure Pipelines
    - Split ci pushes to Failure, Success and Production Branch, so that all pipeline pushes can be reviewed before production
    - Extended Test-protocols in PRs
    - Improve configurability of model_def by hierarchical defaults
    - autogenerated files can be marked as such
    - Results from feature/* branches will be pushed to the corresponding feature/* branch in the target repo, for testing purposes
  • scripts:
    - phobos convert: Fix for Scenes/Worlds, Args for mesh type and export config
  • core/io:
    - Refactor utils
    - Adaption in defaults.json
    - Several bugfixes in mesh handling
    - Bugfixes for poses
    - Configurability for exports has been extended
    - Enhanced submodel export
    - Bugfixes for import/export
  • smurf:
    - Include list of submodels
    - A mesh collision can now be annotated with primitive collisions, during export the user can decide what to export
  • general:
    - Several error messages have been improved
    - Minor codestyle improvements
    - Updated ROS templates for ROS2

Blender:

  • Only minor bugfixes
  • Most bugfixes in Python Module apply here as well

ToDo:

  • Documentation has to be updated accordingly

Related Issues/PRs

#363 #352 #357 #354

Motivation and Context

See Changelog above

How Has This Been Tested?

  • Scripts and Pipeline have been tested in an integrated environment
  • @AlpenAalAlex Would you be so kind to test this at your end?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.

hwiedPro and others added 23 commits October 26, 2023 09:20
Add topic entry
#330
Python Module:
--------------
ci:
  - Support for Azure Pipelines
  - Split ci pushes to Failure, Success and Production Branch, so that all pipeline pushes can be reviewed before production
  - Extended Test-protocols in PRs
  - Improve configurability of model_def by hierarchical defaults
  - autogenerated files can be marked as such
  - Results from feature/* branches will be pushed to the corresponding feature/* branch in the target repo, for testing purposes
scripts:
  - phobos convert: Fix for Scenes/Worlds, Args for mesh type and export config
core/io:
  - Refactor utils
  - Adaption in defaults.json
  - Several bugfixes in mesh handling
  - Bugfixes for poses
  - Configurability for exports has been extended
  - Enhanced submodel export
  - Bugfixes for import/export
smurf:
  - Include list of submodels
  - A mesh collision can now be annotated with primitive collisions, during export the user can decide what to export
general:
  - Several error messages have been improved
  - Minor codestyle improvements
  - Updated ROS templates for ROS2

Blender:
--------
  - Only minor bugfixes
  - Most bugfixes in Python Module apply here as well

ToDo:
-----
  - Documentation has to be updated accordingly
@hwiedPro hwiedPro mentioned this pull request Jun 13, 2024
7 tasks
Copy link
Collaborator

@AlpenAalAlex AlpenAalAlex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left comments on:
phobos/ci/base_model.py:948
phobos/utils/misc.py:291

Everything else looks good 👍

if cwd is None:
cwd = os.getcwd()
if not silent:
log.debug(("Skipping" if dry_run else "Executing") + f": {cmd} in {cwd}")
if dry_run:
return "", ""
proc = subprocess.Popen([cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, cwd=cwd)
proc = subprocess.Popen([cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, cwd=cwd, executable="/bin/bash")
Copy link
Collaborator

@AlpenAalAlex AlpenAalAlex Jun 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This does not work on Windows. For Windows the code can look like this:
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, cwd=cwd)
which changes
[cmd] -> cmd
executable can be omitted or usually C:\Windows\system32\cmd.exe

readme_content = open(readme_path, "r").read()
if "Git LFS" not in readme_content:
with open(readme_path, "a") as readme:
readme.write(open(resources.get_resources_path("GitLFS_README.md.in")).read())
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Faulty indentation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants