Skip to content

Ensure marvin package version is PEP440 compliant#9230

Merged
yadvr merged 1 commit into
apache:4.19from
shapeblue:fix-marvin-packaging
Jun 13, 2024
Merged

Ensure marvin package version is PEP440 compliant#9230
yadvr merged 1 commit into
apache:4.19from
shapeblue:fix-marvin-packaging

Conversation

@vishesh92

@vishesh92 vishesh92 commented Jun 12, 2024

Copy link
Copy Markdown
Member

Description

Fixes #7927

We replace the first occurence of - with + to make the marvin version PEP440 compliant

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

  1. Built the deb packages.
  2. Extracted the marvin tar from the deb package
  3. pip install the package

For testing, use pip version 24.0. Able to reproduce the bug mentioned in the link with this version of pip.

How did you try to break this feature and the system with this change?

@boring-cyborg boring-cyborg Bot added component:marvin Python Warning... Python code Ahead! labels Jun 12, 2024
@vishesh92

Copy link
Copy Markdown
Member Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@vishesh92 vishesh92 changed the title Fix marvin version while building packages Ensure marvin package version is PEP440 compliant Jun 12, 2024
@codecov

codecov Bot commented Jun 12, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 14.96%. Comparing base (edf7394) to head (7cd62ca).
Report is 10 commits behind head on 4.19.

Additional details and impacted files
@@             Coverage Diff              @@
##               4.19    #9230      +/-   ##
============================================
- Coverage     14.96%   14.96%   -0.01%     
  Complexity    11002    11002              
============================================
  Files          5373     5373              
  Lines        469311   469315       +4     
  Branches      57432    57901     +469     
============================================
  Hits          70230    70230              
- Misses       391307   391312       +5     
+ Partials       7774     7773       -1     
Flag Coverage Δ
uitests 4.30% <ø> (ø)
unittests 15.67% <ø> (-0.01%) ⬇️

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.

@blueorangutan

Copy link
Copy Markdown

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 9885

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

clgtm, not sure though if it makes sense to change the version globally this way instead of in the marvin setup.

@vishesh92

Copy link
Copy Markdown
Member Author

@blueorangutan test

@vishesh92
vishesh92 marked this pull request as ready for review June 12, 2024 10:27
@blueorangutan

Copy link
Copy Markdown

@vishesh92 a [SL] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@vishesh92

Copy link
Copy Markdown
Member Author

clgtm, not sure though if it makes sense to change the version globally this way instead of in the marvin setup.

We are changing only for marvin here. I am not sure if changing this globally will break some other stuff or not.

@vishesh92 vishesh92 linked an issue Jun 12, 2024 that may be closed by this pull request
@yadvr yadvr added this to the 4.19.1.0 milestone Jun 12, 2024
@blueorangutan

Copy link
Copy Markdown

[SF] Trillian test result (tid-10418)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 42973 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9230-t10418-kvm-centos7.zip
Smoke tests completed. 130 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_02_trigger_shutdown Failure 341.74 test_safe_shutdown.py

@yadvr
yadvr merged commit 8221be3 into apache:4.19 Jun 13, 2024
@yadvr
yadvr deleted the fix-marvin-packaging branch June 13, 2024 05:59
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jun 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

component:marvin Python Warning... Python code Ahead!

Projects

No open projects
Status: No status

Development

Successfully merging this pull request may close these issues.

PEP 440 When Installing cloudstack-marvin breaks building wheels

4 participants