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

Fix code style guide problems for PEP8 and Flake8 #308

Merged
merged 1 commit into from
Jan 20, 2025
Merged

Fix code style guide problems for PEP8 and Flake8 #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions superflore/generators/ebuild/gen_packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ def _gen_metadata_for_package(
warn("fetch metadata for package {}".format(pkg_name))
return pkg_metadata_xml
package_condition_context = _package_condition_context(distro.name)
pkg = PackageMetadata(pkg_xml, evaluate_condition_context=package_condition_context)
pkg = PackageMetadata(pkg_xml,
evaluate_condition_context=package_condition_context)
pkg_metadata_xml.upstream_email = pkg.upstream_email
pkg_metadata_xml.upstream_name = pkg.upstream_name
pkg_metadata_xml.longdescription = pkg.longdescription
Expand All @@ -174,7 +175,9 @@ def _gen_ebuild_for_package(
pkg_ebuild.src_uri = pkg_rosinstall[0]['tar']['uri']
pkg_names = get_package_names(distro)
package_condition_context = _package_condition_context(distro.name)
pkg_dep_walker = DependencyWalker(distro, evaluate_condition_context=package_condition_context)
pkg_dep_walker = DependencyWalker(
distro,
evaluate_condition_context=package_condition_context)

pkg_buildtool_deps = pkg_dep_walker.get_depends(pkg_name, "buildtool")
pkg_build_deps = pkg_dep_walker.get_depends(pkg_name, "build")
Expand Down Expand Up @@ -209,7 +212,8 @@ def _gen_ebuild_for_package(
except Exception:
warn("fetch metadata for package {}".format(pkg_name))
return pkg_ebuild
pkg = PackageMetadata(pkg_xml, evaluate_condition_context=package_condition_context)
pkg = PackageMetadata(pkg_xml,
evaluate_condition_context=package_condition_context)
pkg_ebuild.upstream_license = pkg.upstream_license
pkg_ebuild.description = pkg.description
pkg_ebuild.homepage = pkg.homepage
Expand Down
4 changes: 2 additions & 2 deletions superflore/generators/ebuild/overlay_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ def regenerate_manifests(
dock.map_directory(self.repo.repo_dir, '/tmp/ros-overlay')
for distro in regen_dict.keys():
chunk_list = []
chunk_count = 0
pkg_list = regen_dict[distro]
while len(pkg_list) > 0:
current_chunk = list()
Expand All @@ -96,7 +95,8 @@ def regenerate_manifests(
info("key_lists: '%s'" % chunk_list)
for chunk in chunk_list:
for pkg in chunk:
pkg_dir = '/tmp/ros-overlay/ros-{0}/{1}'.format(distro, pkg)
pkg_dir = '/tmp/ros-overlay/ros-{0}/{1}'.format(distro,
pkg)
dock.add_bash_command('cd {0}'.format(pkg_dir))
dock.add_bash_command('repoman manifest')
try:
Expand Down