Skip to content

Conversation

@hgreebe
Copy link
Contributor

@hgreebe hgreebe commented Feb 3, 2025

Description of changes

  • Upgrade python version to 3.12 for all OSs except AL2
  • Remove unneccessary Python dep installation
    • Installation on pypi deps in the awsbatch virtual env, cfn bootstrap, and node was added when build image in isolated regions was supported. When I took a close look, I realized that these deps weren't actually installed in the images from before build image in isolatted regions so I removed them.
  • Link to pypi deps for al2 vs every other dependency is different because al2 uses py3.9 and the others use py 3.12

Tests

  • Ran build image for al2 and rhel8

Please review the guidelines for contributing and Pull Request Instructions.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@codecov
Copy link

codecov bot commented Feb 3, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.63%. Comparing base (a21a33e) to head (0ad5a96).
Report is 10 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #2869   +/-   ##
========================================
  Coverage    76.63%   76.63%           
========================================
  Files           22       22           
  Lines         2243     2243           
========================================
  Hits          1719     1719           
  Misses         524      524           
Flag Coverage Δ
unittests 76.63% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@hgreebe hgreebe force-pushed the develop branch 4 times, most recently from 99f1c3c to c767534 Compare February 19, 2025 14:32
@hgreebe hgreebe marked this pull request as ready for review February 19, 2025 14:46
@hgreebe hgreebe requested review from a team as code owners February 19, 2025 14:46
Comment on lines 43 to 57
set -e
tar xzf cookbook-dependencies.tgz
cd dependencies
#{virtualenv_path}/bin/pip install * -f ./ --no-index
#{virtualenv_path}/bin/pip install -r requirements.txt
if [ $? -ne 0 ]; then
tar xzf cookbook-dependencies.tgz
cd dependencies
#{virtualenv_path}/bin/pip install * -f ./ --no-index
fi
Copy link
Contributor

Choose a reason for hiding this comment

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

Why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just so that there is a fall back option

Comment on lines 42 to 46
cookbook_file "#{cookbook_virtualenv_path}/requirements.txt" do
source "cookbook_virtualenv/requirements.txt"
mode '0755'
end

Copy link
Contributor

Choose a reason for hiding this comment

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

Why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

to facilitate the change above

hanwen-cluster
hanwen-cluster previously approved these changes Feb 20, 2025
@hgreebe hgreebe enabled auto-merge (squash) February 20, 2025 18:58
@hgreebe hgreebe merged commit 45431e6 into aws:develop Feb 20, 2025
29 of 31 checks passed
himani2411 pushed a commit to himani2411/aws-parallelcluster-cookbook that referenced this pull request Feb 21, 2025
…ove unneccesary python dep installation (aws#2869)"

This reverts commit 45431e6.
himani2411 pushed a commit to himani2411/aws-parallelcluster-cookbook that referenced this pull request Feb 21, 2025
…ove unneccesary python dep installation (aws#2869)"

This reverts commit 45431e6.
himani2411 added a commit that referenced this pull request Feb 21, 2025
* Revert "[Test] Fix Python version in kitchen tests related to AWS Batch and CFN Boostrap scripts. In particular, we expect all Oses to use Python 3.12.8, except for AL2 which uses 3.9.20."

This reverts commit 4574ee5.

* Revert "Upgrade python version to 3.12 for all OSs except AL2 and remove unneccesary python dep installation (#2869)"

This reverts commit 45431e6.

---------

Co-authored-by: Himani Anil Deshpande <[email protected]>
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