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

Freeze psutil/tensorflow dep #4995

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Freeze psutil/tensorflow dep #4995

merged 1 commit into from
Oct 28, 2024

Conversation

Br2850
Copy link
Contributor

@Br2850 Br2850 commented Oct 28, 2024

What changes are proposed in this pull request?

An attempt to try and freeze testing dependencies so testing images will successfully build

See the previous build error aiming to fix

Screenshot 2024-10-27 at 12 35 00 PM

How is this patch tested? If it is not, please explain why.

Through watching if tests build successfully

Release Notes

Is this a user-facing change that should be mentioned in the release notes?

  • No. You can skip the rest of this section.
  • Yes. Give a description of this change to be included in the release
    notes for FiftyOne users.

(Details in 1-2 sentences. You can just refer to another PR with a description
if this PR is part of a larger change.)

What areas of FiftyOne does this PR affect?

  • App: FiftyOne application changes
  • Build: Build and test infrastructure changes
  • Core: Core fiftyone Python library changes
  • Documentation: FiftyOne documentation changes
  • Other

Summary by CodeRabbit

  • Bug Fixes

    • Updated the tensorflow package version to 2.17.0 in both the main and test requirements, ensuring compatibility and functionality improvements.
  • Chores

    • Removed outdated dependencies common.txt and test.txt from the requirements.

Copy link
Contributor

coderabbitai bot commented Oct 28, 2024

Walkthrough

The changes in this pull request involve modifications to two requirement files: requirements/github.txt and requirements/test.txt. The updates include the removal of two dependencies, common.txt and test.txt, and the specification of the tensorflow package version to 2.17.0 in both files. Other dependencies remain unchanged.

Changes

File Change Summary
requirements/github.txt Removed common.txt and test.txt; updated tensorflow to version 2.17.0.
requirements/test.txt Updated tensorflow to version 2.17.0; other dependencies remain unchanged.

Possibly related PRs

  • Remove six dependency #4554: This PR updates the tensorflow package version in requirements/test.txt, which directly relates to the main PR's change of specifying tensorflow==2.17.0 in both requirements/github.txt and requirements/test.txt.

Suggested reviewers

  • benjaminpkane

🐇 In the meadow, I hop and play,
With dependencies changing day by day.
TensorFlow now has a version clear,
No more confusion, let’s all cheer!
Common and test, we bid adieu,
A simpler path for me and you! 🌼


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.

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.

@Br2850 Br2850 marked this pull request as ready for review October 28, 2024 14:31
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: 2

🧹 Outside diff range and nitpick comments (2)
requirements/github.txt (2)

Line range hint 4-11: Consider freezing all dependency versions

To ensure build stability (which is the PR's objective), consider pinning versions for all dependencies. Currently, some packages have version constraints while others (tensorflow-datasets, torch, torchvision) don't have any version specifications.

Consider updating the remaining dependencies with specific versions:

numpy<2
pydicom>=2.2.0
shapely>=1.7.1
tensorflow==2.15.0
-tensorflow-datasets
-torch
-torchvision
+tensorflow-datasets==4.9.3
+torch==2.1.2
+torchvision==0.16.2

Dependencies from common.txt and test.txt are not consolidated in github.txt

The github.txt file still references common.txt and test.txt while only adding a few additional dependencies (numpy, pydicom, shapely, tensorflow, torch, torchvision). Most dependencies from common.txt (like aiofiles, boto3, httpx, etc.) and test.txt (like pytest and its plugins) are not present in github.txt.

  • The following dependencies need to be consolidated:
    • All dependencies from common.txt (30+ packages including httpx, pandas, matplotlib)
    • All testing dependencies from test.txt (pytest and related packages)
    • Current references to common.txt and test.txt should be removed after consolidation
🔗 Analysis chain

Line range hint 1-2: Verify dependency coverage after removing requirement files

The removal of common.txt and test.txt references changes the dependency management structure. Please ensure all necessary dependencies have been properly consolidated into this file.


Let me verify the contents of github.txt to understand what dependencies have been consolidated there.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Check contents of removed requirement files
echo "Checking for removed requirement files content:"
for file in common.txt test.txt; do
  if [ -f "requirements/$file" ]; then
    echo "Content of $file:"
    cat "requirements/$file"
  fi
done

# Look for any other requirement files that might need consolidation
echo -e "\nOther requirement files in the directory:"
fd -e txt . requirements/

Length of output: 1429


Script:

#!/bin/bash
# Check contents of github.txt
echo "Content of github.txt:"
cat requirements/github.txt

# Check if any dependencies from common.txt and test.txt are now in github.txt
echo -e "\nChecking for dependencies from common.txt and test.txt in github.txt:"
for dep in $(cat requirements/common.txt requirements/test.txt | cut -d'=' -f1); do
    echo "Checking $dep..."
    grep -i "^$dep[=><]" requirements/github.txt || true
done

Length of output: 8770

📜 Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 43411ee and db6a02a.

📒 Files selected for processing (2)
  • requirements/github.txt (1 hunks)
  • requirements/test.txt (1 hunks)
🔇 Additional comments (1)
requirements/test.txt (1)

Line range hint 1-11: Verify TensorFlow compatibility with other dependencies

Let's check if other packages in the requirements have specific TensorFlow version constraints.

@@ -4,7 +4,7 @@
numpy<2
pydicom>=2.2.0
shapely>=1.7.1
tensorflow
tensorflow==2.17.0
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Fix incorrect TensorFlow version number

The specified version tensorflow==2.17.0 appears to be incorrect, as TensorFlow's latest release is 2.15.0. This will cause package installation to fail.

-tensorflow==2.17.0
+tensorflow==2.15.0
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
tensorflow==2.17.0
tensorflow==2.15.0

@@ -7,5 +7,5 @@ pytest-cov==4.0.0
pytest-mock==3.10.0
pytest-asyncio
shapely
tensorflow
tensorflow==2.17.0
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Invalid TensorFlow version specified

The version 2.17.0 of TensorFlow does not exist. The latest stable version is 2.15.0 (as of April 2024). This will cause package installation failures.

Please verify and update to a valid TensorFlow version. Common choices are:

-tensorflow==2.17.0
+tensorflow==2.15.0  # Latest stable version
# or
+tensorflow==2.7.0   # If you need an older version

Committable suggestion was skipped due to low confidence.

@Br2850 Br2850 merged commit 8e51280 into develop Oct 28, 2024
13 checks passed
@Br2850 Br2850 deleted the fix/psutil-dep branch October 28, 2024 15:13
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