Skip to content

Replace deprecated platform.distro call with distro module #13

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.

Sign up for GitHub

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

Closed
odel4y wants to merge 2 commits into from
+8 −6
Closed

Replace deprecated platform.distro call with distro module #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f90490
Replace deprecated platform.distro call with distro module
May 24, 2020
d31d591
Raise required CMake version to 3.0.2 to suppress warning with Noetic
May 24, 2020
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.0.2)
project(mrt_cmake_modules)

find_package(catkin REQUIRED)
Expand Down
2 changes: 2 additions & 0 deletions package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-argparse</exec_depend>
<buildtool_export_depend condition="$ROS_PYTHON_VERSION == 2">python-yaml</buildtool_export_depend>
<buildtool_export_depend condition="$ROS_PYTHON_VERSION == 3">python3-yaml</buildtool_export_depend>
<buildtool_export_depend condition="$ROS_PYTHON_VERSION == 2">python-distro</buildtool_export_depend>
<buildtool_export_depend condition="$ROS_PYTHON_VERSION == 3">python3-distro</buildtool_export_depend>

<export>
<rosdoc config="rosdoc.yaml"/>
Expand Down
10 changes: 5 additions & 5 deletions scripts/generate_cmake_dependency_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import os
import sys
import subprocess
import platform
import distro
import yaml
from catkin_pkg.packages import find_packages
from string import Template
Expand Down Expand Up @@ -142,18 +142,18 @@ def readPackageCMakeData(rosDebYamlFileName):
# dictionary for storing cmake dependencies
# e.g. { "<package name 1>" -> PackageCMakeData, "<package name 2>" -> PackageCMakeData ... }
data = {}
distro = platform.dist()[2]
linux_distribution = distro.linux_distribution()[2]
if 'ROS_OS_OVERRIDE' in os.environ:
ros_os_override = os.environ['ROS_OS_OVERRIDE'].split(':')
if len(ros_os_override) == 2:
distro = ros_os_override[1]
linux_distribution = ros_os_override[1]

for packageName, packageCMakeData in rosDebYamlData.items():
# find out which distribution
if "name" in packageCMakeData:
data[packageName] = PackageCMakeData(packageCMakeData)
elif distro in packageCMakeData:
data[packageName] = PackageCMakeData(packageCMakeData[distro])
elif linux_distribution in packageCMakeData:
data[packageName] = PackageCMakeData(packageCMakeData[linux_distribution])
elif not packageCMakeData:
data[packageName] = PackageCMakeData() # placeholder
return data
Expand Down