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

Updates from updated copier template #1

Merged
merged 6 commits into from
Sep 9, 2024

Conversation

dmurphy18
Copy link
Contributor

What does this PR do?

Updated the salt extension with the latest copier template

What issues does this PR fix or reference?

Fixes:

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@dmurphy18 dmurphy18 added the enhancement New feature or request label Sep 6, 2024
@dmurphy18 dmurphy18 self-assigned this Sep 6, 2024
@dmurphy18
Copy link
Contributor Author

dmurphy18 commented Sep 6, 2024

Running into issue of requirements and the wrong requirements being picked,
macOS 3006 py3.10

287 2024-09-06T20:22:39.2454150Z Collecting pyyaml==5.4.1 (from salt==3006)
288 2024-09-06T20:22:39.2575540Z   Downloading PyYAML-5.4.1.tar.gz (175 kB)
289 2024-09-06T20:22:39.3598350Z   Installing build dependencies: started
290 2024-09-06T20:22:41.1692710Z   Installing build dependencies: finished with status 'done'
291 2024-09-06T20:22:41.1705500Z   Getting requirements to build wheel: started
292 2024-09-06T20:22:41.3293840Z   Getting requirements to build wheel: finished with status 'error'
293 2024-09-06T20:22:41.3328110Z   error: subprocess-exited-with-error

macOS 3007 py3.10

 287 2024-09-06T20:22:31.8550550Z Collecting pyyaml==6.0.1 (from salt==3007)
 288 2024-09-06T20:22:31.8677030Z   Downloading PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl.metadata (2.1 kB)
 289 2024-09-06T20:22:32.0026300Z Collecting pyzmq==25.1.2 (from salt==3007)

And Salt 3006 for darwin (macOS) actually wants pyyaml 6.0.1 as in 3007 selection above
ci/py3.10/darwin.txt

386 pyyaml==6.0.1
387     # via        
388     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
389     #   -r requirements/base.txt
390     #   clustershell                                      
391     #   junos-eznc                
392     #   kubernetes
393     #   pytest-salt-factories
394     #   yamllint
395     #   yamlordereddictloader

pkg/py3.10/darwin.txt

100 pyyaml==6.0.1
101     # via -r requirements/base.txt

This implies will need a requirements file to ensure that the correct verison is picked, since other requirements (in ci) are ensuring pyyaml 6.0.1 is getting picked for 3006, and the extension won't have those other dependencies.

In addition, where is this coming from pyyaml==5.4.1 (from salt==3006), given Salt should have 6.0.1 as a requirement.

@dmurphy18
Copy link
Contributor Author

dmurphy18 commented Sep 6, 2024

Here is the problem, getting the '.0' rather than the current latest shipping
3006

196 2024-09-06T20:22:28.2100380Z ^[[36mnox > ^[[34mpython -m pip install --progress-bar=off salt==3006^[[0m                   
197 2024-09-06T20:22:28.7334640Z Collecting salt==3006
198 2024-09-06T20:22:28.7636440Z   Downloading salt-3006.0.tar.gz (20.4 MB)  

3007

196 2024-09-06T20:22:28.2100380Z ^[[36mnox > ^[[34mpython -m pip install --progress-bar=off salt==3006^[[0m                   
197 2024-09-06T20:22:28.7334640Z Collecting salt==3006
198 2024-09-06T20:22:28.7636440Z   Downloading salt-3006.0.tar.gz (20.4 MB)  

That should be 3006.9 and 3007.1 respectively, and 3006.9 has pyyaml==6.0.1

@dmurphy18 dmurphy18 merged commit 88be709 into salt-extensions:main Sep 9, 2024
8 checks passed
@dmurphy18 dmurphy18 deleted the copier-update branch September 9, 2024 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Development

Successfully merging this pull request may close these issues.

1 participant