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

update to verkko v2.2.1 #51111

Merged
merged 5 commits into from
Oct 3, 2024
Merged

update to verkko v2.2.1 #51111

merged 5 commits into from
Oct 3, 2024

Conversation

skoren
Copy link
Contributor

@skoren skoren commented Oct 2, 2024

Updating to bug fix release of verkko v2.2.1

Summary by CodeRabbit

  • New Features

    • Updated the version of the verkko package to 2.2.1.
    • Enhanced build configuration for better compatibility and handling of shell scripts.
  • Bug Fixes

    • Adjusted compilation flags to improve compatibility with certain Boost library versions.
  • Documentation

    • Updated versioning information format for clarity and consistency.
    • Modified documentation URL to reflect the new version.

Copy link
Contributor

coderabbitai bot commented Oct 2, 2024

📝 Walkthrough
📝 Walkthrough

Walkthrough

This pull request includes updates to the verkko package's meta.yaml file, incrementing the version from "2.2" to "2.2.1" and updating the SHA256 checksum for the source tarball. Additionally, modifications were made to the build.sh script to streamline the build process and enhance functionality. Changes were also applied to various Makefiles, including adjustments to file handling logic, compilation flags, and versioning information, with new conditions added to differentiate linking strategies based on the platform.

Changes

File Path Change Summary
recipes/verkko/meta.yaml - Version updated from 2.2 to 2.2.1
- SHA256 checksum updated from 77a6c8e041bc7... to 4ab40961352c...
- doc_url updated to reflect new version path
recipes/verkko/build.sh - Removed conditional block for Darwin OS, streamlined the creation of $PREFIX/bin
- Introduced environment variable exports for LDFLAGS, CFLAGS, and CXXFLAGS
- Retained conditional check for Boost library removal on Darwin OS
recipes/verkko/osx_availability.patch - Conditional logic added for handling .sh files in src/Makefile.boilermake
- Compilation flags updated to include -DBOOST_NO_CXX98_FUNCTION_BASE
- CPPFLAGS modified to include -D_LIBCPP_DISABLE_AVAILABILITY in multiple makefiles
- New conditional block for LINKFLAGS based on platform
recipes/verkko/version.patch - SRC_INCDIRS changed from -I to -iquote
- INCDIRS updated to include utgcns/libboost
- VERSION updated from verkko release v2.1 to bioconda $(PKG_NAME) bioconda $(PKG_VERSION)

Possibly related PRs

  • Add recipe for consensify #50969: The changes in the meta.yaml file for the consensify package involve defining a new version and SHA256 checksum, similar to the updates made in the meta.yaml for the verkko package in the main PR.

Suggested labels

please review & merge

Suggested reviewers

  • martin-g
  • apeltzer

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 8ff3961 and eb25970.

📒 Files selected for processing (2)
  • recipes/verkko/build.sh (2 hunks)
  • recipes/verkko/meta.yaml (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (2)
  • recipes/verkko/build.sh
  • recipes/verkko/meta.yaml

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
recipes/verkko/build.sh (1)

Line range hint 10-22: LGTM: Overall script structure is sound.

The unchanged parts of the script maintain good practices:

  1. OS-specific handling for macOS (Darwin) to ensure compatibility with system Boost.
  2. Proper build process with clean and parallel make.
  3. Correct installation of binaries and libraries to $PREFIX.

As a minor suggestion for improved readability, consider adding a comment before the Darwin-specific block explaining its purpose, e.g.:

# Remove built-in Boost library on macOS to use system Boost instead
if [ "$(uname)" == "Darwin" ]; then
   ...
fi
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 9f2717f and 8ff3961.

📒 Files selected for processing (2)
  • recipes/verkko/build.sh (1 hunks)
  • recipes/verkko/meta.yaml (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • recipes/verkko/meta.yaml
🔇 Additional comments (3)
recipes/verkko/build.sh (3)

4-4: LGTM: Directory creation is appropriate.

Creating the $PREFIX/bin directory ensures that the subsequent operations have a valid target location. This is a good practice in build scripts.


6-8: LGTM: Appropriate compilation and linking flags set.

The added environment variable exports are crucial for the build process:

  1. LDFLAGS correctly adds the $PREFIX/lib to the library search path.
  2. CFLAGS and CXXFLAGS both include the -O3 optimization flag, which is suitable for release builds.
  3. CXXFLAGS also includes the prefix include directory in the include search path.

These changes ensure that the build process uses the correct libraries and include files from the conda environment, and applies appropriate optimizations.


Line range hint 1-22: Overall LGTM with a request for version verification.

The changes to the build script are appropriate and improve the build process by setting correct compilation and linking flags. The overall structure of the script is sound and follows good practices for bioconda recipes.

However, I noticed that the PR objectives mention updating verkko to version 2.2.1, but this version update is not reflected in the build script. Could you please verify that the version update is handled correctly, possibly in other files of the PR that are not included in this review?

To verify the version update, please run the following command:

✅ Verification successful

Version update verified in recipes/verkko/meta.yaml.

The PR correctly updates verkko to version 2.2.1 in recipes/verkko/meta.yaml using templating syntax.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for version update in meta.yaml file
# Expected result: Should show the updated version number (2.2.1)

rg --type yaml 'version:\s*2\.2\.1' recipes/verkko/meta.yaml

Length of output: 62


Script:

#!/bin/bash
# Description: Search the entire repository for version 2.2.1 to verify the update
# Expected result: Should show occurrences of '2.2.1' indicating the version update

rg '2\.2\.1'

Length of output: 12013

@skoren
Copy link
Contributor Author

skoren commented Oct 2, 2024

@mencian I think the issue is the change to compiler{'rust'} rather than the explicit version. For some reason that changes the build path output (see #48088). It's incorrect to use rukki 0.3.0 since the code is specifically a submodule in verkko so a specific tag was tested/built with verkko and 0.3.0 might not be it.

@mencian
Copy link
Contributor

mencian commented Oct 2, 2024

Reverting to an explicit version of rust did the trick; apologies for not looking into the previous PRs.

@mencian mencian merged commit 0292cdf into bioconda:master Oct 3, 2024
7 checks passed
@mencian mencian mentioned this pull request Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants