Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/dist/
/*.egg-info/
/.coverage
/COLCON_IGNORE
__pycache__/
2 changes: 0 additions & 2 deletions colcon_ros/package_augmentation/ros_ament_python.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,12 @@ def augment_package( # noqa: D102
options = config.get('options', {})

def getter(env):
nonlocal options
return options
break
else:
# use information from setup.py file

def getter(env): # noqa: F811
nonlocal desc
return get_setup_information(
desc.path / 'setup.py', env=env)

Expand Down
2 changes: 0 additions & 2 deletions colcon_ros/package_identification/ros.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ def augment_packages( # noqa: D102
descs, additional_argument_names=additional_argument_names)

# get all parsed ROS package manifests
global _cached_packages
pkgs = {}
for desc in descs:
if str(desc.path) not in _cached_packages:
Expand Down Expand Up @@ -161,7 +160,6 @@ def add_group_dependencies(pkgs):

def get_package_with_build_type(path: str):
"""Get the ROS package and its build type for the given path."""
global _cached_packages
if path not in _cached_packages:
pkg = _get_package(path)
build_type = _get_build_type(pkg, path) if pkg else None
Expand Down
1 change: 0 additions & 1 deletion colcon_ros/prefix_path/ament.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ def __init__(self): # noqa: D107
PrefixPathExtensionPoint.EXTENSION_POINT_VERSION, '^1.0')

def extend_prefix_path(self, paths): # noqa: D102
global _get_ament_prefix_path_warnings
ament_prefix_path = os.environ.get('AMENT_PREFIX_PATH', '')
for path in ament_prefix_path.split(os.pathsep):
if not path:
Expand Down
1 change: 0 additions & 1 deletion colcon_ros/prefix_path/catkin.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def __init__(self): # noqa: D107
PrefixPathExtensionPoint.EXTENSION_POINT_VERSION, '^1.0')

def extend_prefix_path(self, paths): # noqa: D102
global _get_cmake_prefix_path_warnings
cmake_prefix_path = os.environ.get('CMAKE_PREFIX_PATH', '')
for path in cmake_prefix_path.split(os.pathsep):
if not path:
Expand Down
1 change: 1 addition & 0 deletions publish-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ artifacts:
- ubuntu:focal
- ubuntu:jammy
- ubuntu:noble
- ubuntu:resolute
- debian:bookworm
- debian:trixie
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ classifiers =
Development Status :: 3 - Alpha
Environment :: Plugins
Intended Audience :: Developers
License :: OSI Approved :: Apache Software License
Operating System :: MacOS
Operating System :: Microsoft :: Windows
Operating System :: POSIX
Programming Language :: Python
Topic :: Software Development :: Build Tools
license = Apache License, Version 2.0
license = Apache-2.0
description = Extension for colcon to support ROS packages.
long_description = file: README.rst
keywords = colcon
Expand Down Expand Up @@ -57,10 +56,10 @@ test =

[tool:pytest]
filterwarnings =
error
# Suppress deprecation warnings in other packages
ignore:lib2to3 package is deprecated::scspell
ignore:pkg_resources is deprecated as an API::flake8_import_order
ignore:::pkg_resources
ignore:SelectableGroups dict interface is deprecated::flake8
ignore:Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated::pyreadline
ignore:the imp module is deprecated in favour of importlib.*:DeprecationWarning
Expand Down
4 changes: 2 additions & 2 deletions stdeb.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[colcon-ros]
No-Python2:
Depends3: python3-catkin-pkg-modules (>= 0.4.14) | python3-catkin-pkg (>= 0.4.14), python3-colcon-cmake (>= 0.2.6), python3-colcon-core (>= 0.7.0), python3-colcon-pkg-config, python3-colcon-python-setup-py (>= 0.2.4), python3-colcon-recursive-crawl
Suite: focal jammy noble bookworm trixie
Suite: focal jammy noble resolute bookworm trixie
X-Python3-Version: >= 3.6
Debian-Version: 100
Upstream-Version-Suffix: +upstream
1 change: 0 additions & 1 deletion test/test_spell_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

@pytest.fixture(scope='module')
def known_words():
global spell_check_words_path
return spell_check_words_path.read_text().splitlines()


Expand Down
Loading