From c6b01a356258f2747297007df7874b384b9f76c6 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 7 May 2024 20:45:38 -0500 Subject: [PATCH 1/6] Revert "fix: pkg_resources deprecated warning" This change was released for Ubuntu and Debian platforms which don't package a Python 2 version of importlib_metadata. We need to create a new release to restore support on those platforms. This reverts commit 34815766eefe04c495b7b0a37fe93d47df9d595c. --- setup.py | 5 +---- src/rosdep2/platforms/pip.py | 11 +++-------- stdeb.cfg | 2 +- test/test_rosdep_pip.py | 7 ------- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/setup.py b/setup.py index 2b8c24847..5cd814bef 100644 --- a/setup.py +++ b/setup.py @@ -9,10 +9,7 @@ 'version': '0.23.0', 'packages': ['rosdep2', 'rosdep2.ament_packages', 'rosdep2.platforms'], 'package_dir': {'': 'src'}, - 'install_requires': [ - 'PyYAML >= 3.1', - 'importlib_metadata; python_version<"3.8"' - ], + 'install_requires': ['PyYAML >= 3.1', 'setuptools'], 'extras_require': { 'test': [ 'flake8 < 6', diff --git a/src/rosdep2/platforms/pip.py b/src/rosdep2/platforms/pip.py index 8ca4ba03a..8dfbb6927 100644 --- a/src/rosdep2/platforms/pip.py +++ b/src/rosdep2/platforms/pip.py @@ -30,14 +30,10 @@ from __future__ import print_function import os +import pkg_resources import subprocess import sys -try: - import importlib.metadata as importlib_metadata -except ImportError: - import importlib_metadata - from ..core import InstallFailed from ..installers import PackageManagerInstaller from ..shell_utils import read_stdout @@ -134,9 +130,8 @@ def __init__(self): super(PipInstaller, self).__init__(pip_detect, supports_depends=True) def get_version_strings(self): - pip_version = importlib_metadata.version('pip') - # keeping the name "setuptools" for backward compatibility - setuptools_version = importlib_metadata.version('setuptools') + pip_version = pkg_resources.get_distribution('pip').version + setuptools_version = pkg_resources.get_distribution('setuptools').version version_strings = [ 'pip {}'.format(pip_version), 'setuptools {}'.format(setuptools_version), diff --git a/stdeb.cfg b/stdeb.cfg index ae7270d22..8d38745e3 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -18,7 +18,7 @@ Setup-Env-Vars: SKIP_PYTHON_MODULES=1 [rosdep_modules] Depends: ca-certificates, python-rospkg-modules (>= 1.4.0), python-yaml, python-catkin-pkg-modules (>= 0.4.0), python-rosdistro-modules (>= 0.7.5), python-setuptools, sudo -Depends3: ca-certificates, python3-rospkg-modules (>= 1.4.0), python3-yaml, python3-catkin-pkg-modules (>= 0.4.0), python3-rosdistro-modules (>= 0.7.5), python3 (>= 3.8) | python3-importlib-metadata, sudo +Depends3: ca-certificates, python3-rospkg-modules (>= 1.4.0), python3-yaml, python3-catkin-pkg-modules (>= 0.4.0), python3-rosdistro-modules (>= 0.7.5), python3-setuptools, sudo Conflicts: python-rosdep (<< 0.18.0), python-rosdep2 Conflicts3: python3-rosdep (<< 0.18.0), python3-rosdep2 Replaces: python-rosdep (<< 0.18.0) diff --git a/test/test_rosdep_pip.py b/test/test_rosdep_pip.py index 2e34ffca5..a74b2f095 100644 --- a/test/test_rosdep_pip.py +++ b/test/test_rosdep_pip.py @@ -117,13 +117,6 @@ def test(expected_prefix, mock_method, mock_get_pip_command): raise -def test_PipInstaller_get_version_strings(): - from rosdep2.platforms.pip import PipInstaller - - installer = PipInstaller() - assert installer.get_version_strings() - - def test_get_pip_command(): from rosdep2.platforms.pip import get_pip_command From 12e4d589b550c4b9b6dbb9f59323e64b54dc035b Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 7 May 2024 20:58:19 -0500 Subject: [PATCH 2/6] Restore bionic and buster for one last release --- stdeb.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdeb.cfg b/stdeb.cfg index 8d38745e3..334ed559d 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -11,7 +11,7 @@ Conflicts: python3-rosdep, python-rosdep2, python3-rosdep2 Conflicts3: python-rosdep, python-rosdep2, python3-rosdep2 Copyright-File: LICENSE Suite: bionic buster -Suite3: focal jammy noble bookworm trixie +Suite3: bionic buster focal jammy noble bookworm trixie Python2-Depends-Name: python X-Python3-Version: >= 3.6 Setup-Env-Vars: SKIP_PYTHON_MODULES=1 @@ -25,7 +25,7 @@ Replaces: python-rosdep (<< 0.18.0) Replaces3: python3-rosdep (<< 0.18.0) Copyright-File: LICENSE Suite: bionic buster -Suite3: focal jammy noble bookworm trixie +Suite3: bionic buster focal jammy noble bookworm trixie Python2-Depends-Name: python X-Python3-Version: >= 3.6 Setup-Env-Vars: SKIP_PYTHON_SCRIPTS=1 From 274dd65107c08b83061865bb4942706256b867b4 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 7 May 2024 20:56:26 -0500 Subject: [PATCH 3/6] 0.23.1 --- CHANGELOG.rst | 19 ++++++++++++++++++- setup.py | 2 +- src/rosdep2/_version.py | 2 +- stdeb.cfg | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e8286aae2..ec4fd4eff 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,4 +1,21 @@ -0.23.0 (2023-04-19) +0.23.1 (2024-05-07) +------------------- +- Revert "fix: pkg_resources deprecated warning" + - https://github.com/ros-infrastructure/rosdep/issues/968 +- Add Windows-specific ENOENT error message to test + - https://github.com/ros-infrastructure/rosdep/pull/961 +- Skip a test rather than passing when not on Ubuntu + - https://github.com/ros-infrastructure/rosdep/pull/962 +- Fix some platform-specific path assumptions in tests + - https://github.com/ros-infrastructure/rosdep/pull/960 +- Fix shell-specific test assumptions + - https://github.com/ros-infrastructure/rosdep/pull/959 +- Prevent git from adding CR to certain test artifacts + - https://github.com/ros-infrastructure/rosdep/pull/958 +- Fix several tests which require os.geteuid + - https://github.com/ros-infrastructure/rosdep/pull/957 + +0.23.0 (2024-04-19) ------------------- - Use setup.cfg to configure flake8, instead of in the ci code - https://github.com/ros-infrastructure/rosdep/pull/930 diff --git a/setup.py b/setup.py index 5cd814bef..b7e1c452e 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ # same version as in: # - src/rosdep2/_version.py # - stdeb.cfg - 'version': '0.23.0', + 'version': '0.23.1', 'packages': ['rosdep2', 'rosdep2.ament_packages', 'rosdep2.platforms'], 'package_dir': {'': 'src'}, 'install_requires': ['PyYAML >= 3.1', 'setuptools'], diff --git a/src/rosdep2/_version.py b/src/rosdep2/_version.py index d70a78e26..b964732d7 100644 --- a/src/rosdep2/_version.py +++ b/src/rosdep2/_version.py @@ -1,4 +1,4 @@ # same version as in: # - setup.py # - stdeb.cfg -__version__ = '0.23.0' +__version__ = '0.23.1' diff --git a/stdeb.cfg b/stdeb.cfg index 334ed559d..53f0aa87d 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -2,11 +2,11 @@ ; rosdep-modules same version as in: ; - setup.py ; - src/rosdep2/_version.py -Depends: python-rosdep-modules (>= 0.23.0) +Depends: python-rosdep-modules (>= 0.23.1) ; rosdep-modules same version as in: ; - setup.py ; - src/rosdep2/_version.py -Depends3: python3-rosdep-modules (>= 0.23.0) +Depends3: python3-rosdep-modules (>= 0.23.1) Conflicts: python3-rosdep, python-rosdep2, python3-rosdep2 Conflicts3: python-rosdep, python-rosdep2, python3-rosdep2 Copyright-File: LICENSE From c0367e262c08c7042d92715161513e2f0581924a Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 7 May 2024 21:08:20 -0500 Subject: [PATCH 4/6] Drop support for Python 2 * The minimum Python version is now 3.6 * EOL Debian/Ubuntu suites have been dropped * Use of the 'mock' backport package has been removed --- Makefile | 2 +- setup.py | 2 +- stdeb.cfg | 16 ++-------------- test/test_rosdep_alpine.py | 5 +---- test/test_rosdep_arch.py | 5 +---- test/test_rosdep_cygwin.py | 5 +---- test/test_rosdep_debian.py | 5 +---- test/test_rosdep_freebsd.py | 5 +---- test/test_rosdep_gem.py | 5 +---- test/test_rosdep_gentoo.py | 5 +---- test/test_rosdep_installers.py | 5 +---- test/test_rosdep_loader.py | 5 +---- test/test_rosdep_main.py | 6 +----- test/test_rosdep_npm.py | 5 +---- test/test_rosdep_opensuse.py | 5 +---- test/test_rosdep_osx.py | 5 +---- test/test_rosdep_pip.py | 5 +---- test/test_rosdep_redhat.py | 5 +---- test/test_rosdep_rospkg_loader.py | 5 +---- test/test_rosdep_slackware.py | 5 +---- 20 files changed, 21 insertions(+), 85 deletions(-) diff --git a/Makefile b/Makefile index 141195bd9..9b4fb9f27 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all setup clean_dist distro clean install testsetup test NAME='rosdep' -VERSION=`python setup.py -V` +VERSION=`python3 setup.py -V` all: echo "noop for debbuild" diff --git a/setup.py b/setup.py index b7e1c452e..15a487076 100644 --- a/setup.py +++ b/setup.py @@ -10,11 +10,11 @@ 'packages': ['rosdep2', 'rosdep2.ament_packages', 'rosdep2.platforms'], 'package_dir': {'': 'src'}, 'install_requires': ['PyYAML >= 3.1', 'setuptools'], + 'python_requires': '>=3.6', 'extras_require': { 'test': [ 'flake8 < 6', 'flake8-comprehensions', - "mock; python_version < '3.3'", 'pytest', ], }, diff --git a/stdeb.cfg b/stdeb.cfg index 53f0aa87d..2e475360a 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -2,30 +2,18 @@ ; rosdep-modules same version as in: ; - setup.py ; - src/rosdep2/_version.py -Depends: python-rosdep-modules (>= 0.23.1) -; rosdep-modules same version as in: -; - setup.py -; - src/rosdep2/_version.py Depends3: python3-rosdep-modules (>= 0.23.1) -Conflicts: python3-rosdep, python-rosdep2, python3-rosdep2 Conflicts3: python-rosdep, python-rosdep2, python3-rosdep2 Copyright-File: LICENSE -Suite: bionic buster -Suite3: bionic buster focal jammy noble bookworm trixie -Python2-Depends-Name: python +Suite3: focal jammy noble bookworm trixie X-Python3-Version: >= 3.6 Setup-Env-Vars: SKIP_PYTHON_MODULES=1 [rosdep_modules] -Depends: ca-certificates, python-rospkg-modules (>= 1.4.0), python-yaml, python-catkin-pkg-modules (>= 0.4.0), python-rosdistro-modules (>= 0.7.5), python-setuptools, sudo Depends3: ca-certificates, python3-rospkg-modules (>= 1.4.0), python3-yaml, python3-catkin-pkg-modules (>= 0.4.0), python3-rosdistro-modules (>= 0.7.5), python3-setuptools, sudo -Conflicts: python-rosdep (<< 0.18.0), python-rosdep2 Conflicts3: python3-rosdep (<< 0.18.0), python3-rosdep2 -Replaces: python-rosdep (<< 0.18.0) Replaces3: python3-rosdep (<< 0.18.0) Copyright-File: LICENSE -Suite: bionic buster -Suite3: bionic buster focal jammy noble bookworm trixie -Python2-Depends-Name: python +Suite3: focal jammy noble bookworm trixie X-Python3-Version: >= 3.6 Setup-Env-Vars: SKIP_PYTHON_SCRIPTS=1 diff --git a/test/test_rosdep_alpine.py b/test/test_rosdep_alpine.py index a1aac7729..9eb401c1b 100644 --- a/test/test_rosdep_alpine.py +++ b/test/test_rosdep_alpine.py @@ -29,10 +29,7 @@ import os import traceback -try: - from unittest.mock import Mock, call, patch -except ImportError: - from mock import Mock, call, patch +from unittest.mock import Mock, call, patch import rospkg.os_detect diff --git a/test/test_rosdep_arch.py b/test/test_rosdep_arch.py index 219b6642f..4c1fc0654 100644 --- a/test/test_rosdep_arch.py +++ b/test/test_rosdep_arch.py @@ -29,10 +29,7 @@ import os import traceback -try: - from unittest.mock import Mock, patch -except ImportError: - from mock import Mock, patch +from unittest.mock import Mock, patch def get_test_dir(): diff --git a/test/test_rosdep_cygwin.py b/test/test_rosdep_cygwin.py index 1919e240d..ec6b8ae20 100644 --- a/test/test_rosdep_cygwin.py +++ b/test/test_rosdep_cygwin.py @@ -29,10 +29,7 @@ import os import traceback -try: - from unittest.mock import patch -except ImportError: - from mock import patch +from unittest.mock import patch def get_test_dir(): diff --git a/test/test_rosdep_debian.py b/test/test_rosdep_debian.py index 6c3ae4ec8..e8d4a43a7 100644 --- a/test/test_rosdep_debian.py +++ b/test/test_rosdep_debian.py @@ -29,10 +29,7 @@ import os import traceback -try: - from unittest.mock import Mock, patch, call -except ImportError: - from mock import Mock, patch, call +from unittest.mock import Mock, patch, call def get_test_dir(): diff --git a/test/test_rosdep_freebsd.py b/test/test_rosdep_freebsd.py index bcda1ea3e..b670b076b 100644 --- a/test/test_rosdep_freebsd.py +++ b/test/test_rosdep_freebsd.py @@ -30,10 +30,7 @@ import os import traceback -try: - from unittest.mock import patch, Mock -except ImportError: - from mock import patch, Mock +from unittest.mock import patch, Mock def get_test_dir(): diff --git a/test/test_rosdep_gem.py b/test/test_rosdep_gem.py index cb4b2d78a..46afcbfbd 100644 --- a/test/test_rosdep_gem.py +++ b/test/test_rosdep_gem.py @@ -31,10 +31,7 @@ import os import traceback -try: - from unittest.mock import Mock, patch -except ImportError: - from mock import Mock, patch +from unittest.mock import Mock, patch def get_test_dir(): diff --git a/test/test_rosdep_gentoo.py b/test/test_rosdep_gentoo.py index 015753dfc..109a1b962 100644 --- a/test/test_rosdep_gentoo.py +++ b/test/test_rosdep_gentoo.py @@ -29,10 +29,7 @@ import os import traceback -try: - from unittest.mock import Mock, patch -except ImportError: - from mock import Mock, patch +from unittest.mock import Mock, patch import rospkg.os_detect diff --git a/test/test_rosdep_installers.py b/test/test_rosdep_installers.py index c54fca18a..5638d9caa 100644 --- a/test/test_rosdep_installers.py +++ b/test/test_rosdep_installers.py @@ -28,11 +28,8 @@ from __future__ import print_function from contextlib import contextmanager -try: - from unittest.mock import Mock, patch -except ImportError: - from mock import Mock, patch from unittest import SkipTest +from unittest.mock import Mock, patch import os import sys try: diff --git a/test/test_rosdep_loader.py b/test/test_rosdep_loader.py index b5f2cefb0..9864b99c6 100644 --- a/test/test_rosdep_loader.py +++ b/test/test_rosdep_loader.py @@ -25,10 +25,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -try: - from unittest.mock import Mock -except ImportError: - from mock import Mock +from unittest.mock import Mock def test_RosdepLoader(): diff --git a/test/test_rosdep_main.py b/test/test_rosdep_main.py index c94143c24..382949204 100644 --- a/test/test_rosdep_main.py +++ b/test/test_rosdep_main.py @@ -37,11 +37,7 @@ import rospkg.os_detect import unittest - -try: - from unittest.mock import DEFAULT, patch -except ImportError: - from mock import DEFAULT, patch +from unittest.mock import DEFAULT, patch from rosdep2 import main from rosdep2.ament_packages import AMENT_PREFIX_PATH_ENV_VAR diff --git a/test/test_rosdep_npm.py b/test/test_rosdep_npm.py index a56c8caa7..2d96ae6ba 100644 --- a/test/test_rosdep_npm.py +++ b/test/test_rosdep_npm.py @@ -31,10 +31,7 @@ import os import traceback -try: - from unittest.mock import Mock, patch -except ImportError: - from mock import Mock, patch +from unittest.mock import Mock, patch def get_test_dir(): diff --git a/test/test_rosdep_opensuse.py b/test/test_rosdep_opensuse.py index 42e44399a..72dbab063 100644 --- a/test/test_rosdep_opensuse.py +++ b/test/test_rosdep_opensuse.py @@ -29,10 +29,7 @@ import os import traceback -try: - from unittest.mock import patch -except ImportError: - from mock import patch +from unittest.mock import patch def get_test_dir(): diff --git a/test/test_rosdep_osx.py b/test/test_rosdep_osx.py index 5803701e4..7da5ba982 100644 --- a/test/test_rosdep_osx.py +++ b/test/test_rosdep_osx.py @@ -32,10 +32,7 @@ import os import traceback -try: - from unittest.mock import call, Mock, patch -except ImportError: - from mock import call, Mock, patch +from unittest.mock import call, Mock, patch def get_test_dir(): diff --git a/test/test_rosdep_pip.py b/test/test_rosdep_pip.py index a74b2f095..d2a6b59b5 100644 --- a/test/test_rosdep_pip.py +++ b/test/test_rosdep_pip.py @@ -30,10 +30,7 @@ import os import sys import traceback -try: - from unittest.mock import Mock, patch -except ImportError: - from mock import Mock, patch +from unittest.mock import Mock, patch def get_test_dir(): diff --git a/test/test_rosdep_redhat.py b/test/test_rosdep_redhat.py index 39607610e..e7444b1b8 100644 --- a/test/test_rosdep_redhat.py +++ b/test/test_rosdep_redhat.py @@ -29,10 +29,7 @@ import os import traceback -try: - from unittest.mock import patch, Mock -except ImportError: - from mock import patch, Mock +from unittest.mock import patch, Mock def get_test_dir(): diff --git a/test/test_rosdep_rospkg_loader.py b/test/test_rosdep_rospkg_loader.py index aa38b9dcc..bf5198471 100644 --- a/test/test_rosdep_rospkg_loader.py +++ b/test/test_rosdep_rospkg_loader.py @@ -29,11 +29,8 @@ import os import yaml +from unittest.mock import Mock -try: - from unittest.mock import Mock -except ImportError: - from mock import Mock from rospkg import RosPack, RosStack diff --git a/test/test_rosdep_slackware.py b/test/test_rosdep_slackware.py index 303d7e1e1..c81e1e9d1 100644 --- a/test/test_rosdep_slackware.py +++ b/test/test_rosdep_slackware.py @@ -29,10 +29,7 @@ import os import traceback -try: - from unittest.mock import Mock, patch -except ImportError: - from mock import Mock, patch +from unittest.mock import Mock, patch import rospkg.os_detect From 96e2aa71cc61e45a9081ddc9e6ebd9d67566b1a2 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 7 May 2024 21:14:03 -0500 Subject: [PATCH 5/6] Reapply "fix: pkg_resources deprecated warning" This is safe to change now that we no longer support Python 2. This reverts commit c6b01a356258f2747297007df7874b384b9f76c6. --- setup.py | 5 ++++- src/rosdep2/platforms/pip.py | 11 ++++++++--- stdeb.cfg | 2 +- test/test_rosdep_pip.py | 7 +++++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 15a487076..0b6008f3f 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,10 @@ 'version': '0.23.1', 'packages': ['rosdep2', 'rosdep2.ament_packages', 'rosdep2.platforms'], 'package_dir': {'': 'src'}, - 'install_requires': ['PyYAML >= 3.1', 'setuptools'], + 'install_requires': [ + 'PyYAML >= 3.1', + 'importlib_metadata; python_version<"3.8"', + ], 'python_requires': '>=3.6', 'extras_require': { 'test': [ diff --git a/src/rosdep2/platforms/pip.py b/src/rosdep2/platforms/pip.py index 8dfbb6927..8ca4ba03a 100644 --- a/src/rosdep2/platforms/pip.py +++ b/src/rosdep2/platforms/pip.py @@ -30,10 +30,14 @@ from __future__ import print_function import os -import pkg_resources import subprocess import sys +try: + import importlib.metadata as importlib_metadata +except ImportError: + import importlib_metadata + from ..core import InstallFailed from ..installers import PackageManagerInstaller from ..shell_utils import read_stdout @@ -130,8 +134,9 @@ def __init__(self): super(PipInstaller, self).__init__(pip_detect, supports_depends=True) def get_version_strings(self): - pip_version = pkg_resources.get_distribution('pip').version - setuptools_version = pkg_resources.get_distribution('setuptools').version + pip_version = importlib_metadata.version('pip') + # keeping the name "setuptools" for backward compatibility + setuptools_version = importlib_metadata.version('setuptools') version_strings = [ 'pip {}'.format(pip_version), 'setuptools {}'.format(setuptools_version), diff --git a/stdeb.cfg b/stdeb.cfg index 2e475360a..83bc32255 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -10,7 +10,7 @@ X-Python3-Version: >= 3.6 Setup-Env-Vars: SKIP_PYTHON_MODULES=1 [rosdep_modules] -Depends3: ca-certificates, python3-rospkg-modules (>= 1.4.0), python3-yaml, python3-catkin-pkg-modules (>= 0.4.0), python3-rosdistro-modules (>= 0.7.5), python3-setuptools, sudo +Depends3: ca-certificates, python3-rospkg-modules (>= 1.4.0), python3-yaml, python3-catkin-pkg-modules (>= 0.4.0), python3-rosdistro-modules (>= 0.7.5), python3 (>= 3.8) | python3-importlib-metadata, sudo Conflicts3: python3-rosdep (<< 0.18.0), python3-rosdep2 Replaces3: python3-rosdep (<< 0.18.0) Copyright-File: LICENSE diff --git a/test/test_rosdep_pip.py b/test/test_rosdep_pip.py index d2a6b59b5..4fd359d0d 100644 --- a/test/test_rosdep_pip.py +++ b/test/test_rosdep_pip.py @@ -114,6 +114,13 @@ def test(expected_prefix, mock_method, mock_get_pip_command): raise +def test_PipInstaller_get_version_strings(): + from rosdep2.platforms.pip import PipInstaller + + installer = PipInstaller() + assert installer.get_version_strings() + + def test_get_pip_command(): from rosdep2.platforms.pip import get_pip_command From 0858188f0f25f26e013b5c5ed4978fef175ab359 Mon Sep 17 00:00:00 2001 From: Scott K Logan Date: Tue, 7 May 2024 21:16:26 -0500 Subject: [PATCH 6/6] 0.24.0 --- CHANGELOG.rst | 7 +++++++ setup.py | 2 +- src/rosdep2/_version.py | 2 +- stdeb.cfg | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ec4fd4eff..7acb076be 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,10 @@ +0.24.0 (2024-05-07) +------------------- +- Reapply "fix: pkg_resources deprecated warning" + - https://github.com/ros-infrastructure/rosdep/issues/968 +- Drop support for Python 2 + - https://github.com/ros-infrastructure/rosdep/issues/968 + 0.23.1 (2024-05-07) ------------------- - Revert "fix: pkg_resources deprecated warning" diff --git a/setup.py b/setup.py index 0b6008f3f..addc1bd77 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ # same version as in: # - src/rosdep2/_version.py # - stdeb.cfg - 'version': '0.23.1', + 'version': '0.24.0', 'packages': ['rosdep2', 'rosdep2.ament_packages', 'rosdep2.platforms'], 'package_dir': {'': 'src'}, 'install_requires': [ diff --git a/src/rosdep2/_version.py b/src/rosdep2/_version.py index b964732d7..5b9b24208 100644 --- a/src/rosdep2/_version.py +++ b/src/rosdep2/_version.py @@ -1,4 +1,4 @@ # same version as in: # - setup.py # - stdeb.cfg -__version__ = '0.23.1' +__version__ = '0.24.0' diff --git a/stdeb.cfg b/stdeb.cfg index 83bc32255..2f74eb967 100644 --- a/stdeb.cfg +++ b/stdeb.cfg @@ -2,7 +2,7 @@ ; rosdep-modules same version as in: ; - setup.py ; - src/rosdep2/_version.py -Depends3: python3-rosdep-modules (>= 0.23.1) +Depends3: python3-rosdep-modules (>= 0.24.0) Conflicts3: python-rosdep, python-rosdep2, python3-rosdep2 Copyright-File: LICENSE Suite3: focal jammy noble bookworm trixie