Skip to content

Rebase + improvements for #727#1

Merged
nalt merged 28 commits intonalt:masterfrom
mateus-amarante:update-dep-type-option
Oct 8, 2020
Merged

Rebase + improvements for #727#1
nalt merged 28 commits intonalt:masterfrom
mateus-amarante:update-dep-type-option

Conversation

@mateus-amarante
Copy link
Copy Markdown

Hello, @nalt. I'm very interested in this PR ros-infrastructure#727 you opened last year. It is outdated, so I decided to work on it to make it ready to merge. However, instead of creating a duplicate PR for the updates, I'm requesting a merge to your branch. Please, consider merging it to fix the PR to the upstream repository or, if you prefer, I can open a new PR and you close ros-infrastructure#727.

This PR includes:

  • Rebase with master implementing necessary fixes
  • Add support to exec and doc dependencies
  • Add tests

wjwwood and others added 28 commits November 20, 2019 08:00
* attempt to fix macos CI

* try brew update first instead
Signed-off-by: Shane Loretz <sloretz@openrobotics.org>
…ure#738)

* [update] skip other distro if --rosdistro passed

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>

* ignore argument if specified distro doesnt exist

* address review comments

* update help message for rosdistro

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
* test newer python
* use yaml.safe_load
* pin PyYAML version for Python 3.4
* pass user flag to pip when needed
* move slow jobs to the top to reduce CI time

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
* Resolve Alpine os_version_type using OsDetect
* Reduced Alpine OS VERSION to Major.Minor
* support null for entire OS and not only OS version

syntax like 'ubuntu: null' will now be raising ResolutionError with
relevant error message instead of InvalidData with obscure error message
will also cover syntax like:
"
ubuntu:
  '*': null
  bionic: [foobar]
"

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>

Co-authored-by: Scott K Logan <logans@cottsay.net>
Output YUM, DNF and RPM versions with `--all-versions` and fix the format guide's default PM for Fedora.
If tests rely on the environment being a certain way, they should ensure
it meets its expectations. Update the tests to ensure they're testing
multiple euid conditions, and setting it explicitly where required.

Fix ros-infrastructure#702

Signed-off-by: Kyle Fazzari <kyle@canonical.com>
* Enable PIP installer for openSUSE

* openSUSE package detection with RPM capabilities

Packages sometimes get renamed and their old name is kept as an rpm capability (like an alias), so the additional flag `--whatprovides` is passed to the `rpm` query.
…infrastructure#737)

* Fix conditional dependencies when one package uses manifest.xml

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>

* Return rosdeps as a list to avoid breaking the interface.

Co-authored-by: Steven! Ragnarök <steven@nuclearsandwich.com>
* guard next(inter)

  Fix ros-infrastructure#691

Signed-off-by: artivis <jeremie.deray@canonical.com>

* Handle StopIteration with slightly less line noise.

Co-authored-by: Steven! Ragnarök <steven@nuclearsandwich.com>
* Add console script entry point

Add console script entry point for platforms (e.g. Windows) not supporting shebang.

* remove scripts entry since we are using console_scripts.

* fix bad merge.

* fix SKIP_PYTHON_SCRIPTS case.

Co-authored-by: Lou Amadio <ooeygui@users.noreply.github.com>
…astructure#750)

When the rosdep modules package was split in [ros-infrastructure#731] the module
dependencies weren't updated to only depend on modules packages
themselves which prevents rosdep modules for python2 and python3 from
actually being co-installable.

I haven't yet audited to make sure there's no cli usage of these tools
in the modules but it's Friday afternoon and I wanted to get this inked
before I walked away.

When I return to it I'll check for that before proceeding for reviews.
not adding 'exec_depends' or 'build_export_depends' are both are included inside 'run_depends'

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
* add alias for Pop! OS

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
@mateus-amarante
Copy link
Copy Markdown
Author

Actually, I think I messed the thinks up a bit. I think the ideal move would be rebasing your branch nalt:master before (and remove my last commit, which resolves the conflicts I think would not be needed anymore). In this way, you can see the updates more clearly.

@nalt nalt merged commit e2b6273 into nalt:master Oct 8, 2020
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.