Skip to content

Commit

Permalink
Fix code style guide problems for PEP8 and Flake8
Browse files Browse the repository at this point in the history
The CI system picked up non-conformance issues with recent changes
to the ebuild generator.

Fix lines that exceed 79 characters and remove an used chunk_count
variable.

Signed-off-by: Rob Woolley <[email protected]>
  • Loading branch information
robwoolley committed Dec 11, 2024
1 parent 2f88ce7 commit 7258477
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
10 changes: 7 additions & 3 deletions superflore/generators/ebuild/gen_packages.py
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
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

0 comments on commit 7258477

Please sign in to comment.