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

Allow files paths for include URIs #448

Merged
merged 4 commits into from
Jan 14, 2021
Merged

Conversation

azeey
Copy link
Collaborator

@azeey azeey commented Dec 23, 2020

//include/uri used to only take directories that contain a model.config file and the sdformat file. However, allowing //include/uri to take file names can be supported without loss of functionality and will allow users to specify non-sdformat files to include via the Interface API, when it's implemented.

Toward #430

//include/uri used to only take directories that contain a model.config
file and the sdformat file. However, allowing //include/uri to take file
names can be supported without loss of functionality.

Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey added enhancement New feature or request 🏢 edifice Ignition Edifice labels Dec 23, 2020
@azeey azeey added this to the SDFormat 1.8 / libsdformat11 milestone Dec 23, 2020
@codecov-io
Copy link

Codecov Report

Merging #448 (3b8de07) into master (e0e09f9) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #448      +/-   ##
==========================================
+ Coverage   87.63%   87.66%   +0.02%     
==========================================
  Files          63       63              
  Lines        9622     9620       -2     
==========================================
+ Hits         8432     8433       +1     
+ Misses       1190     1187       -3     
Impacted Files Coverage Δ
src/parser.cc 79.68% <100.00%> (+0.29%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e0e09f9...3b8de07. Read the comment docs.

Copy link
Collaborator

@brawner brawner left a comment

Choose a reason for hiding this comment

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

Looks good to me with some minor nitpicks.

test/integration/includes.cc Show resolved Hide resolved
test/integration/includes.cc Outdated Show resolved Hide resolved
Copy link
Collaborator

@EricCousineau-TRI EricCousineau-TRI left a comment

Choose a reason for hiding this comment

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

Sweet, looks great!

@azeey azeey merged commit e8b30f0 into gazebosim:master Jan 14, 2021
@azeey azeey deleted the accept_file_uris branch January 14, 2021 23:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants