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

py : fix requirements check '==' -> '~=' #8982

Merged
merged 3 commits into from
Aug 12, 2024
Merged

py : fix requirements check '==' -> '~=' #8982

merged 3 commits into from
Aug 12, 2024

Conversation

ggerganov
Copy link
Owner

ref #7599 (comment)

@@ -2,4 +2,4 @@
--extra-index-url https://download.pytorch.org/whl/cpu
pillow~=10.2.0
torch~=2.2.1
torchvision==0.17.1
torchvision!=0.17.1
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this intentional? I don't know what that syntax does in pip but it seems like it should be ~= instead.

Copy link
Owner Author

Choose a reason for hiding this comment

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

Thanks for catching this, it was a mistake

@compilade
Copy link
Collaborator

It seems like the check-requirements.sh CI check doesn't run on all requirements.txt changes like this one (which was also why the problem was introduced).

Maybe using the same glob pattern as in check-requirements.sh could help?

for req in */**/requirements*.txt; do

(and adapting it to conform to GitHub's file path pattern syntax)

diff --git a/.github/workflows/python-check-requirements.yml b/.github/workflows/python-check-requirements.yml
index 4e0374fc..46e80aec 100644
--- a/.github/workflows/python-check-requirements.yml
+++ b/.github/workflows/python-check-requirements.yml
@@ -6,15 +6,13 @@ on:
       - '.github/workflows/python-check-requirements.yml'
       - 'scripts/check-requirements.sh'
       - 'convert*.py'
-      - 'requirements.txt'
-      - 'requirements/*.txt'
+      - '**/requirements*.txt'
   pull_request:
     paths:
       - '.github/workflows/python-check-requirements.yml'
       - 'scripts/check-requirements.sh'
       - 'convert*.py'
-      - 'requirements.txt'
-      - 'requirements/*.txt'
+      - '**/requirements*.txt'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}

@github-actions github-actions bot added the devops improvements to build systems and github actions label Aug 12, 2024
@compilade compilade added the merge ready indicates that this may be ready to merge soon and is just holding out in case of objections label Aug 12, 2024
@ggerganov ggerganov merged commit d3ae0ee into master Aug 12, 2024
11 checks passed
@ggerganov ggerganov deleted the gg/py-check branch August 12, 2024 08:02
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Nov 15, 2024
* py : fix requirements check '==' -> '~='

* cont : fix the fix

* ci : run on all requirements.txt
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Nov 18, 2024
* py : fix requirements check '==' -> '~='

* cont : fix the fix

* ci : run on all requirements.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
devops improvements to build systems and github actions examples merge ready indicates that this may be ready to merge soon and is just holding out in case of objections
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants