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.

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

Jump to bottom

Switch to rosdistro.get_package_condition_context API #1065

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Switch to rosdistro.get_package_condition_context API #1065

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
a9bcec8
Switch to rosdistro.get_package_condition_context API
cottsay Oct 11, 2024
b3ee322
Actually import warnings
cottsay Oct 11, 2024
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 ros_buildfarm/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
import warnings


package_format_mapping = {
Expand Down Expand Up @@ -742,6 +743,10 @@ def filter_buildfile_packages_recursively(package_names, buildfile, rosdistro_na


def get_package_condition_context(index, rosdistro_name):
warnings.warn(
'ros_buildfarm.common.get_package_condition_context is deprecated, '
'use rosdistro.get_package_condition_context instead.',
DeprecationWarning, stacklevel=2)
python_version = index.distributions[rosdistro_name].get('python_version')
ros_version = {
'ros1': '1',
Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/release_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
from ros_buildfarm.common import get_implicitly_ignored_package_names
from ros_buildfarm.common import get_node_label
from ros_buildfarm.common import get_os_package_name
from ros_buildfarm.common import get_package_condition_context
from ros_buildfarm.common import get_package_manifests
from ros_buildfarm.common import get_release_binary_view_name
from ros_buildfarm.common import get_release_job_prefix
Expand All @@ -50,6 +49,7 @@
from rosdistro import get_distribution_cache
from rosdistro import get_distribution_file as rosdistro_get_distribution_file
from rosdistro import get_index
from rosdistro import get_package_condition_context


def configure_release_jobs(
Expand Down
2 changes: 1 addition & 1 deletion ros_buildfarm/scripts/doc/create_doc_task_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
from ros_buildfarm.common import get_distribution_repository_keys
from ros_buildfarm.common import get_doc_job_url
from ros_buildfarm.common import get_os_package_name
from ros_buildfarm.common import get_package_condition_context
from ros_buildfarm.common import get_release_job_urls
from ros_buildfarm.common import get_user_id
from ros_buildfarm.common import Scope
Expand All @@ -62,6 +61,7 @@
from rosdep2.catkin_support import resolve_for_os
from rosdistro import get_distribution_file
from rosdistro import get_index
from rosdistro import get_package_condition_context
import yaml


Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@
kwargs['scripts'] = []
else:
kwargs['install_requires'] += [
'catkin_pkg >= 0.2.6', 'jenkinsapi', 'rosdistro >= 0.4.0', 'vcstool >= 0.1.37']
'catkin_pkg >= 0.2.6', 'jenkinsapi', 'rosdistro >= 1.0.0', 'vcstool >= 0.1.37']

setup(**kwargs)
8 changes: 4 additions & 4 deletions stdeb.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ Debian-Version: 100
; ros-buildfarm-modules same version (without the branch suffix) as in:
; - ros_buildfarm/__init__.py
; - setup.py
Depends: python-argparse, python-catkin-pkg-modules, python-ros-buildfarm-modules (>= 3.0.0), python-rosdistro-modules, python-yaml
Depends: python-argparse, python-catkin-pkg-modules, python-ros-buildfarm-modules (>= 3.0.0), python-rosdistro-modules (>= 1.0.0), python-yaml
; ros-buildfarm-modules same version (without the branch suffix) as in:
; - ros_buildfarm/__init__.py
; - setup.py
Depends3: python3-catkin-pkg-modules, python3-ros-buildfarm-modules (>= 3.0.0), python3-rosdistro-modules, python3-yaml
Depends3: python3-catkin-pkg-modules, python3-ros-buildfarm-modules (>= 3.0.0), python3-rosdistro-modules (>= 1.0.0), python3-yaml
Conflicts: python3-ros-buildfarm
Conflicts3: python-ros-buildfarm
Suite: xenial yakkety zesty artful bionic cosmic disco eoan stretch buster
Expand All @@ -16,8 +16,8 @@ Python2-Depends-Name: python
Setup-Env-Vars: SKIP_PYTHON_MODULES=1

[ros_buildfarm_modules]
Depends: python-catkin-pkg-modules, python-configparser, python-empy, python-rosdistro-modules, python-yaml, python3-empy, python3-vcstool (>= 0.1.37)
Depends3: python3-catkin-pkg-modules, python3-empy, python3-rosdistro-modules, python3-vcstool (>= 0.1.37), python3-yaml
Depends: python-catkin-pkg-modules, python-configparser, python-empy, python-rosdistro-modules (>= 1.0.0), python-yaml, python3-empy, python3-vcstool (>= 0.1.37)
Depends3: python3-catkin-pkg-modules, python3-empy, python3-rosdistro-modules (>= 1.0.0), python3-vcstool (>= 0.1.37), python3-yaml
Conflicts: python-ros-buildfarm (<< 1.3.0)
Conflicts3: python3-ros-buildfarm (<< 1.3.0)
Replaces: python-ros-buildfarm (<< 1.3.0)
Expand Down
Loading