Skip to content
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.

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

0.24.0 #969

Merged
merged 6 commits into from
May 8, 2024
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
26 changes: 25 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,28 @@
0.23.0 (2023-04-19)
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"
- 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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
# same version as in:
# - src/rosdep2/_version.py
# - stdeb.cfg
'version': '0.23.0',
'version': '0.24.0',
'packages': ['rosdep2', 'rosdep2.ament_packages', 'rosdep2.platforms'],
'package_dir': {'': 'src'},
'install_requires': [
'PyYAML >= 3.1',
'importlib_metadata; python_version<"3.8"'
'importlib_metadata; python_version<"3.8"',
],
'python_requires': '>=3.6',
'extras_require': {
'test': [
'flake8 < 6',
'flake8-comprehensions',
"mock; python_version < '3.3'",
'pytest',
],
},
Expand Down
2 changes: 1 addition & 1 deletion src/rosdep2/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# same version as in:
# - setup.py
# - stdeb.cfg
__version__ = '0.23.0'
__version__ = '0.24.0'
14 changes: 1 addition & 13 deletions stdeb.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,18 @@
; rosdep-modules same version as in:
; - setup.py
; - src/rosdep2/_version.py
Depends: python-rosdep-modules (>= 0.23.0)
; rosdep-modules same version as in:
; - setup.py
; - src/rosdep2/_version.py
Depends3: python3-rosdep-modules (>= 0.23.0)
Conflicts: python3-rosdep, python-rosdep2, python3-rosdep2
Depends3: python3-rosdep-modules (>= 0.24.0)
Conflicts3: python-rosdep, python-rosdep2, python3-rosdep2
Copyright-File: LICENSE
Suite: bionic buster
Suite3: focal jammy noble bookworm trixie
Python2-Depends-Name: python
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 (>= 3.8) | python3-importlib-metadata, 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: focal jammy noble bookworm trixie
Python2-Depends-Name: python
X-Python3-Version: >= 3.6
Setup-Env-Vars: SKIP_PYTHON_SCRIPTS=1
5 changes: 1 addition & 4 deletions test/test_rosdep_alpine.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_arch.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_cygwin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_debian.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_freebsd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_gem.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_gentoo.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_installers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
6 changes: 1 addition & 5 deletions test/test_rosdep_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_npm.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_opensuse.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_osx.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_pip.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_redhat.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_rospkg_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
5 changes: 1 addition & 4 deletions test/test_rosdep_slackware.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading