forked from ros2/sros2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove the use of pkg_resources. (ros2#225)
* Remove the use of pkg_resources. Importing pkg_resources is slow; really slow. pkg_resources is also somewhat deprecated. For both of these reaons, we would prefer to move away from pkg_resources and start using importlib instead. sros2 was using 'resource_filename' from pkg_resources. The equivalent in importlib is importlib.resources, but there is a catch. As of Python 3.8, importlib.resources does not support getting data from subdirectories. The workaround is to make each level of the directory structure a python module, so that the module name can be looked up. Python 3.9 will have support for directories for resources, but that won't help on Ubuntu Focal. More information is in https://gitlab.com/python-devs/importlib_resources/issues/58 Signed-off-by: Chris Lalancette <[email protected]>
- Loading branch information
1 parent
cd234c1
commit dbec91d
Showing
7 changed files
with
160 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Copyright 2020 Open Source Robotics Foundation, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
""" | ||
Workaround to make importlib.resources path lookup work. | ||
importlib.resources in Python 3.8 and earlier doesn't support looking up paths | ||
in subdirectories. However, it does support looking up paths in python modules, | ||
so we add this __init__.py to make this subdirectoy a module. This workaround | ||
can be removed when all of the target platforms support Python 3.9 and later; | ||
see https://gitlab.com/python-devs/importlib_resources/issues/58 for details. | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Copyright 2020 Open Source Robotics Foundation, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
""" | ||
Workaround to make importlib.resources path lookup work. | ||
importlib.resources in Python 3.8 and earlier doesn't support looking up paths | ||
in subdirectories. However, it does support looking up paths in python modules, | ||
so we add this __init__.py to make this subdirectoy a module. This workaround | ||
can be removed when all of the target platforms support Python 3.9 and later; | ||
see https://gitlab.com/python-devs/importlib_resources/issues/58 for details. | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Copyright 2020 Open Source Robotics Foundation, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
""" | ||
Workaround to make importlib.resources path lookup work. | ||
importlib.resources in Python 3.8 and earlier doesn't support looking up paths | ||
in subdirectories. However, it does support looking up paths in python modules, | ||
so we add this __init__.py to make this subdirectoy a module. This workaround | ||
can be removed when all of the target platforms support Python 3.9 and later; | ||
see https://gitlab.com/python-devs/importlib_resources/issues/58 for details. | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Copyright 2020 Open Source Robotics Foundation, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
""" | ||
Workaround to make importlib.resources path lookup work. | ||
importlib.resources in Python 3.8 and earlier doesn't support looking up paths | ||
in subdirectories. However, it does support looking up paths in python modules, | ||
so we add this __init__.py to make this subdirectoy a module. This workaround | ||
can be removed when all of the target platforms support Python 3.9 and later; | ||
see https://gitlab.com/python-devs/importlib_resources/issues/58 for details. | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Copyright 2020 Open Source Robotics Foundation, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
""" | ||
Workaround to make importlib.resources path lookup work. | ||
importlib.resources in Python 3.8 and earlier doesn't support looking up paths | ||
in subdirectories. However, it does support looking up paths in python modules, | ||
so we add this __init__.py to make this subdirectoy a module. This workaround | ||
can be removed when all of the target platforms support Python 3.9 and later; | ||
see https://gitlab.com/python-devs/importlib_resources/issues/58 for details. | ||
""" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Copyright 2020 Open Source Robotics Foundation, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
""" | ||
Workaround to make importlib.resources path lookup work. | ||
importlib.resources in Python 3.8 and earlier doesn't support looking up paths | ||
in subdirectories. However, it does support looking up paths in python modules, | ||
so we add this __init__.py to make this subdirectoy a module. This workaround | ||
can be removed when all of the target platforms support Python 3.9 and later; | ||
see https://gitlab.com/python-devs/importlib_resources/issues/58 for details. | ||
""" |