improve support for null entries#726
Conversation
Codecov Report
@@ Coverage Diff @@
## master #726 +/- ##
==========================================
+ Coverage 75.85% 76.34% +0.48%
==========================================
Files 40 40
Lines 3148 3293 +145
==========================================
+ Hits 2388 2514 +126
- Misses 760 779 +19
Continue to review full report at Codecov.
|
e51d98f to
ba1b2a1
Compare
cottsay
left a comment
There was a problem hiding this comment.
This is great. It's come up several times now, and as python 2 packages drop like flies out of Fedora and EPEL, it's only going to get worse.
Thanks!
|
@cottsay @nuclearsandwich friendly 🛎️ |
|
@cottsay @nuclearsandwich is there anything holding this approved PR ? |
nuclearsandwich
left a comment
There was a problem hiding this comment.
I think this is much clearer. Love that this has tests. Thanks @mikaelarguedas
Not from my end. Thanks for the re-ping. I've kicked CI up again and if it comes back 🆗 I'll merge. I think @cottsay has some additional PRs that need review before the next release is made so this may sit on master for a while longer but I'll use this as an impelling force to get those reviewed, merged, and released as well. |
|
Sounds good, CI will most likely need #739 to come back ✔️ |
tfoote
left a comment
There was a problem hiding this comment.
This looks good but needs a rebase to pass CI
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>
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
Co-Authored-By: Scott K Logan <logans@cottsay.net>
d58a6aa to
527de9f
Compare
|
rebased and passing CI |
* Add Suite3 option with Ubuntu Focal (ros-infrastructure#734) Signed-off-by: Shane Loretz <sloretz@openrobotics.org> * [update] Allow to process single ROS distro, fix 723 (ros-infrastructure#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> * Fix CI and reduce CI time (ros-infrastructure#739) * 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> * Strip Alpine's patch version from OS codename (ros-infrastructure#716) * Resolve Alpine os_version_type using OsDetect * Reduced Alpine OS VERSION to Major.Minor * improve support for null entries (ros-infrastructure#726) * 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> * Use DNF installer on RHEL 8 and newer (ros-infrastructure#713) RHEL/CentOS 8 uses DNF by default. * Updates to YUM and DNF (ros-infrastructure#640) Output YUM, DNF and RPM versions with `--all-versions` and fix the format guide's default PM for Fedora. * tests: don't assume euid != 0 (ros-infrastructure#703) 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> * openSUSE package query and install enhancements (ros-infrastructure#729) * 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. * Fix conditional dependencies when one package uses manifest.xml (ros-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) (ros-infrastructure#701) * 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> * [Windows] Add console script entry point (ros-infrastructure#656) * 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> * Depend on modules packages only to allow co-installability. (ros-infrastructure#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. * 0.19.0 * also install buildtool_export_depends (ros-infrastructure#753) not adding 'exec_depends' or 'build_export_depends' are both are included inside 'run_depends' Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com> * Drop shebang from a non-executable file (ros-infrastructure#755) * add alias for Pop! OS (ros-infrastructure#757) * add alias for Pop! OS Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com> Co-authored-by: Shane Loretz <sloretz@openrobotics.org> Co-authored-by: Mikael Arguedas <mikael.arguedas@gmail.com> Co-authored-by: Mark Hedley Jones <MarkHedleyJones@gmail.com> Co-authored-by: Scott K Logan <logans@cottsay.net> Co-authored-by: Kyle Fazzari <kyle@canonical.com> Co-authored-by: Bjar Ne <43565432+gleichdick@users.noreply.github.com> Co-authored-by: Jeremie Deray <deray.jeremie@gmail.com> Co-authored-by: Sean Yen <seanyen@microsoft.com> Co-authored-by: Lou Amadio <ooeygui@users.noreply.github.com>
syntax like 'ubuntu: null' will now be raising ResolutionError with
relevant error message instead of InvalidData
This came up recently with ros/rosdistro#21906
This should also fix / improve error message for issues like #689
Details
before:
after:
Second commit improves the formatting, but can be ommitted if disruptive as it;s not really related to this fix
Details
before:
after:
Signed-off-by: Mikael Arguedas mikael.arguedas@gmail.com