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

Install ONE requirements file with all requirements. #2955

Merged
merged 4 commits into from
Jul 4, 2024

Conversation

matz-e
Copy link
Collaborator

@matz-e matz-e commented Jul 4, 2024

When installing NMODL requirements after the fixed numpy version,
NMODLs lesser constrained dependencies take precedence over the
currently installed packages.

This PR:

  • Will consider only the build dependencies of NMODL
  • Construct one requirements file with the merged requirements of
    NMODL, NEURON
  • Fix a setuptools requirement for Python 3.12 and Windows that broke with a newer version

When installing NMODL requirements after the fixed numpy version,
NMODLs lesser constrained dependencies take precedence over the
currently installed packages.

This PR:

* Will consider only the build dependencies of NMODL
* Construct one requirements file with the merged requirements of
NMODL, NEURON
@ferdonline
Copy link
Member

Will it fix

Downloading numpy-1.26.0-cp312-cp312-macosx_10_9_x86_64.whl (20.3 MB)
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━        16.8/20.3 MB 4.5 MB/s eta 0:00:01
ERROR: THESE PACKAGES DO NOT MATCH THE HASHES FROM THE REQUIREMENTS FILE. If you have updated the package versions, please update the hashes

?

@matz-e
Copy link
Collaborator Author

matz-e commented Jul 4, 2024

THESE PACKAGES DO NOT MATCH THE HASHES FROM THE REQUIREMENTS FILE

Can do by adding --no-cache-dir to the pip command.

@matz-e
Copy link
Collaborator Author

matz-e commented Jul 4, 2024

Actually --no-cache-dir would probably lead to a lot more downloads and longer runtime. Seems to me that the issue may also be truncated downloads - more a networking issue within the CI.

So the error may occur even more frequently if we don't cache...

Copy link

codecov bot commented Jul 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.25%. Comparing base (8ffa1fa) to head (470a4bc).

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2955      +/-   ##
==========================================
- Coverage   67.25%   67.25%   -0.01%     
==========================================
  Files         571      571              
  Lines      104902   104902              
==========================================
- Hits        70557    70550       -7     
- Misses      34345    34352       +7     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bbpbuildbot

This comment has been minimized.

@matz-e matz-e requested review from pramodk and JCGoran July 4, 2024 09:39
Copy link

✔️ 233d970 -> Azure artifacts URL

Copy link

sonarcloud bot commented Jul 4, 2024

Copy link

✔️ 470a4bc -> Azure artifacts URL

Copy link
Member

@pramodk pramodk left a comment

Choose a reason for hiding this comment

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

LGTM

ci/win_install_deps.cmd Show resolved Hide resolved
@pramodk pramodk enabled auto-merge (squash) July 4, 2024 11:46
@pramodk pramodk merged commit 12aba8b into master Jul 4, 2024
38 checks passed
@pramodk pramodk deleted the simpler-python-requirements-installation branch July 4, 2024 11:55
@JCGoran
Copy link
Contributor

JCGoran commented Jul 4, 2024

Will it fix

Downloading numpy-1.26.0-cp312-cp312-macosx_10_9_x86_64.whl (20.3 MB)
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━        16.8/20.3 MB 4.5 MB/s eta 0:00:01
ERROR: THESE PACKAGES DO NOT MATCH THE HASHES FROM THE REQUIREMENTS FILE. If you have updated the package versions, please update the hashes

?

For reference, I am about 99% sure it's this issue: pypa/pip#11153
It happens intermittently, and is usually fixed by re-running the job.

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.

5 participants