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

app-admin/webapp-config: EAPI 7 -> 8, PEP517 #30041

Closed
wants to merge 1 commit into from

Conversation

ceamac
Copy link
Contributor

@ceamac ceamac commented Mar 10, 2023

Bump to EAPI 8
Switch to PEP517 build mode
Fix SRC_URI (upload tarball from cache to devspace)
Sync (and fix) live

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Mar 10, 2023

LICENSE="GPL-2"
SLOT="0"
IUSE="+portage"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure why we have this USE flag

portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"

python_prepare_all() {
# make the source from svn mirror the one in the tarball
Copy link
Contributor Author

Choose a reason for hiding this comment

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

It did not install without this block. I compared the git with the tarball and it seems it has a copy of itself in a directory named webapp-config. Doing this fixed the problem.

distutils-r1_python_install_all

# distutils-r1 installs the scripts in /usr/bin in PEP517 mode
mv "${ED}"/usr/bin "${ED}"/usr/sbin || die "Cannot rename scripts directory to /usr/sbin"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I looked in distutils-r1.eclass, scripts are always installed into /usr/bin, but webapp.eclass needs them in /usr/sbin. I hope this hack is acceptable.

PYTHON_COMPAT=( python3_{9..11} )

inherit distutils-r1 prefix

if [[ ${PV} = 9999* ]]
then
EGIT_REPO_URI="https://anongit.gentoo.org/proj/${PN}.git"
EGIT_REPO_URI="https://gitweb.gentoo.org/proj/${PN}.git"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like anongit no longer works, gitweb works.

@ceamac ceamac requested a review from thesamesam March 10, 2023 11:16
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-03-10 11:23 UTC
Newest commit scanned: a5ac19d
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/588eb64f6c/output.html

ceamac added a commit to ceamac/gentoo that referenced this pull request Mar 10, 2023
Bump to EAPI 8
Switch to PEP517 build mode
Fix SRC_URI (upload tarball from cache to devspace)
Sync (and fix) live

Closes: https://bugs.gentoo.org/711750
Closes: gentoo#30041
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
@ceamac ceamac force-pushed the app-admin/webapp-config/pep517 branch from a5ac19d to 3a43db0 Compare March 10, 2023 11:31
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-03-10 11:43 UTC
Newest commit scanned: 3a43db0
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/04fc6e5009/output.html

ceamac added a commit to ceamac/gentoo that referenced this pull request Jul 8, 2023
Bump to EAPI 8
Switch to PEP517 build mode
Fix SRC_URI (upload tarball from cache to devspace)
Sync (and fix) live

Closes: https://bugs.gentoo.org/711750
Closes: https://bugs.gentoo.org/909862
Closes: gentoo#30041
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
@ceamac ceamac force-pushed the app-admin/webapp-config/pep517 branch from 3a43db0 to 1930aba Compare July 8, 2023 07:13
Bump to EAPI 8
Switch to PEP517 build mode
Fix SRC_URI (upload tarball from cache to devspace)
Sync (and fix) live

Closes: https://bugs.gentoo.org/711750
Closes: https://bugs.gentoo.org/909862
Closes: gentoo#30041
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
@ceamac ceamac force-pushed the app-admin/webapp-config/pep517 branch from 1930aba to d71124f Compare July 8, 2023 07:16
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-07-08 07:25 UTC
Newest commit scanned: 1930aba
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/f16e143b63/output.html

@ceamac ceamac changed the title app-admin/webapp-config: EAPI 7 -> 8 app-admin/webapp-config: EAPI 7 -> 8, PEP517 [please reassign] Jul 8, 2023
@gentoo-bot gentoo-bot changed the title app-admin/webapp-config: EAPI 7 -> 8, PEP517 [please reassign] app-admin/webapp-config: EAPI 7 -> 8, PEP517 Jul 8, 2023
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @ceamac
Areas affected: ebuilds
Packages affected: app-admin/webapp-config

app-admin/webapp-config: @gentoo/web-apps

Linked bugs

Bugs linked: 909862, 711750


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. and removed assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Jul 8, 2023
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-07-08 07:40 UTC
Newest commit scanned: d71124f
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/41b45bd6ff/output.html

@gentoo-bot gentoo-bot closed this in af245d8 Jul 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants