Skip to content

Resolve dependency version conflicts #1627

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

Merged
merged 1 commit into from
Jun 20, 2025

Conversation

jxnl
Copy link
Collaborator

@jxnl jxnl commented Jun 20, 2025

A dependency conflict between instructor[google-genai] and google-genai over the tenacity package was resolved.

  • The conflict arose because instructor required tenacity >=9.0.0,<10.0.0, while google-genai (version 1.21.1) required tenacity >=8.2.3,<9.0.0.
  • The tenacity dependency in pyproject.toml was updated to >=8.2.3,<10.0.0. This broadened the acceptable tenacity version range to accommodate both packages.
  • The uv.lock file was updated to reflect these dependency changes.
  • The fix was verified by successfully installing both instructor[google-genai] and google-genai in a test environment, confirming no conflicts and successful imports.
  • A new branch, fix/tenacity-dependency-conflict, was created.
  • Changes were committed with the message fix(deps): resolve tenacity version conflict with google-genai.

Important

Resolve tenacity version conflict between instructor[google-genai] and google-genai by updating pyproject.toml.

  • Dependency Resolution:
    • Updated tenacity version in pyproject.toml to >=8.2.3,<10.0.0 to resolve conflict between instructor[google-genai] and google-genai.
    • Updated uv.lock to reflect the new tenacity version range.
  • Verification:
    • Successfully installed instructor[google-genai] and google-genai in a test environment to confirm no conflicts.
  • Branch and Commit:
    • Created branch fix/tenacity-dependency-conflict.
    • Committed changes with message fix(deps): resolve tenacity version conflict with google-genai.

This description was created by Ellipsis for 5ac6f39. You can customize this summary. It will automatically update as commits are pushed.

Changes tenacity requirement from >=9.0.0,<10.0.0 to >=8.2.3,<10.0.0 to be compatible with google-genai package which requires tenacity >=8.2.3,<9.0.0. This resolves the dependency conflict reported in issue #1623 where users could not install instructor[google-genai] and google-genai together.

Fixes: #1623
Copy link

cloudflare-workers-and-pages bot commented Jun 20, 2025

Deploying with  Cloudflare Workers  Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status Name Latest Commit Preview URL Updated (UTC)
✅ Deployment successful!
View logs
instructor 5ac6f39 Commit Preview URL Jun 20 2025, 08:12 PM

@jxnl jxnl merged commit caf0f7a into main Jun 20, 2025
14 of 16 checks passed
@jxnl jxnl deleted the cursor/resolve-dependency-version-conflicts-2dd4 branch June 20, 2025 20:10
@github-actions github-actions bot added bug Something isn't working dependencies Pull requests that update a dependency file python Pull requests that update python code labels Jun 20, 2025
Copy link
Contributor

@ellipsis-dev ellipsis-dev bot left a comment

Choose a reason for hiding this comment

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

Important

Looks good to me! 👍

Reviewed everything up to 5ac6f39 in 1 minute and 6 seconds. Click for details.
  • Reviewed 13 lines of code in 1 files
  • Skipped 0 files when reviewing.
  • Skipped posting 1 draft comments. View those below.
  • Modify your settings and rules to customize what types of comments Ellipsis leaves. And don't forget to react with 👍 or 👎 to teach Ellipsis.
1. pyproject.toml:12
  • Draft comment:
    Ensure that instructor remains fully compatible with tenacity versions starting at 8.2.3. The previous lower bound was 9.0.0, so verify that none of the features or behaviors expected from tenacity (≥9.0.0) are required by instructor.
  • Reason this comment was not posted:
    Comment did not seem useful. Confidence is useful = 0% <= threshold 85% This comment is asking the PR author to verify compatibility with a specific version of a dependency, which is not allowed by the rules. It does not provide a specific code suggestion or ask for a specific test to be written. Therefore, it should be removed.

Workflow ID: wflow_6JmRKdIWSVXwslCD

You can customize Ellipsis by changing your verbosity settings, reacting with 👍 or 👎, replying to comments, or adding code review rules.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working dependencies Pull requests that update a dependency file python Pull requests that update python code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants