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.

Sign up for GitHub

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

Jump to bottom

Move ansible setuptools configuration into setup.cfg #530

Merged
merged 10 commits into from
Jul 7, 2023
Merged

Move ansible setuptools configuration into setup.cfg #530

merged 10 commits into from
Jul 7, 2023

Conversation

gotmax23
Copy link
Contributor

@gotmax23 gotmax23 commented May 9, 2023 •
edited
Loading

Fixes: #504

@gotmax23
Copy link
Contributor Author

gotmax23 commented May 9, 2023

The contents of the wheels for 7.5.0 and 8.0.0a3 are the same before and after this change.

@felixfontein
Copy link
Collaborator

I think this is too late for the Ansible 8 release cycle, and definitely too late for the Ansible 7 release cycle, and should thus only apply to Ansible 9+.

@gotmax23
Copy link
Contributor Author

Fair enough. I'll add back that code for those versions.

@gotmax23 gotmax23 force-pushed the metadata branch 2 times, most recently from 6538c16 to 76f8983 Compare May 22, 2023 01:11
@gotmax23
Copy link
Contributor Author

TODO: add a changelog entry

@gotmax23
Copy link
Contributor Author

I'm not sure what's causing:

ERROR: found collection dependency errors!
ERROR: dellemc.enterprise_sonic version_conflict: ansible.netcommon-5.1.1 but needs >=2.0.0,<5.0.0

-- https://github.com/ansible-community/antsibull/actions/runs/5040720589/jobs/9039753648?pr=530#step:12:14

The build-dumb-pypi job seems to be building for 7.99.0. Ansible 7 has

ansible.netcommon: >=4.1.0,<5.0.0

so I'm not sure how ansible.netcommon-5.1.1 is getting in there...

@felixfontein
Copy link
Collaborator

That CI workflow is generating a new .build file for every run ("Generate the list of compatible versions" step).

@gotmax23
Copy link
Contributor Author

I force pushed to update the changelog entry. This should be ready for review now.

@gotmax23
Copy link
Contributor Author

That CI workflow is generating a new .build file for every run ("Generate the list of compatible versions" step).

Ah, I didn't read that workflow closely enough. Thanks! I guess we'll need to fix that separately.

felixfontein
felixfontein reviewed Jun 28, 2023
View reviewed changes
changelogs/fragments/530-setup-cfg.yaml Outdated Show resolved Hide resolved
changelogs/fragments/530-setup-cfg.yaml Outdated Show resolved Hide resolved
changelogs/fragments/530-setup-cfg.yaml Outdated Show resolved Hide resolved
noxfile.py Outdated Show resolved Hide resolved
tests/test_data/package-files/7.5.0/dist-files/ansible-7.5.0-py3-none-any.whl Outdated Show resolved Hide resolved
noxfile.py Show resolved Hide resolved
noxfile.py Outdated Show resolved Hide resolved
@gotmax23
add tests for generate-package-files subcommand
7e6b593 
I had to use `git add -f tests/test_data/package-files/` as our
.gitignore excluded some of the test_Data files.
@gotmax23 gotmax23 force-pushed the metadata branch 2 times, most recently from 8270459 to a86afcc Compare June 29, 2023 23:30
felixfontein
felixfontein reviewed Jul 3, 2023
View reviewed changes
Copy link
Collaborator

@felixfontein felixfontein left a comment

Choose a reason for hiding this comment

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

Besides this, LGTM!

.github/workflows/nox.yml Outdated Show resolved Hide resolved
gotmax23 and others added 7 commits July 7, 2023 03:27
@gotmax23
CI: make nox.yml DRY and add check_package_files
3495de6
@gotmax23
rewrite verify_package_files tests in Python
bf3feca
@gotmax23
tests: commit pristine setup.pys from sdists
c28e8f3 
The next commit will show any differences between the new setup.py
generation code and the old code.
@gotmax23
add LegacyBuildMetaMaker; make write-package-files DRY
61d8a9e 
We still want to build legacy setup.py for ansible 6, 7, and 8. Instead
of duplicating the old code in build_ansible_commands.py, add a
LegacyBuildMetaMaker class with the same interface as BuildMetaMaker.

Note that there's a few differences in the 8.0.0a1 setup.py. I have no
idea why there's extra entries that don't seem to exist in the original
source distribution, but the final wheel's file list is the same.

This change also moves the package file generation code into a function
that can be shared by the rebuild-single and generate-package-files
commands. Typing annotations are changed to StrPath for files where
possible.
@gotmax23
nox: add check_package_files(8.1.0_setup_cfg)
c04eb88 
Temporarily test the setup.cfg generator with 8.1.0.
@gotmax23 @felixfontein
Improve changelog entrys' formatting
ed0c412 
Co-authored-by: Felix Fontein <felix@fontein.de>
@gotmax23
verify_package_files: add .txt extension to file lists
ac0fe26
@gotmax23
Copy link
Contributor Author

gotmax23 commented Jul 7, 2023

Squashed fixup commit

@gotmax23 gotmax23 merged commit 3427a98 into ansible-community:main Jul 7, 2023
@gotmax23
Copy link
Contributor Author

gotmax23 commented Jul 7, 2023

Thanks for reviewing this @felixfontein. I plan to let this sit for a couple days and then cut a new release. We have a good amount of unreleased changes.

@felixfontein
Copy link
Collaborator

Thanks for working on this! Sounds good to me.

gotmax23 added a commit to gotmax23/ansible-build-data that referenced this pull request Jul 9, 2023
@gotmax23
9: add changelog entry for setup.cfg configuration
3706bcb 
Relates: ansible-community/antsibull-build#530
@gotmax23 gotmax23 mentioned this pull request Jul 9, 2023
Merged
gotmax23 added a commit to ansible-community/ansible-build-data that referenced this pull request Jul 9, 2023
@gotmax23
9: add changelog entry for setup.cfg configuration (#260)
09f78ce 
Relates: ansible-community/antsibull-build#530
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@felixfontein felixfontein felixfontein approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add subcommand to generate build files
2 participants
@gotmax23 @felixfontein