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

switch to pypi sdist #3356

Merged
merged 10 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions dev-python/daff/daff-1.3.46.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
# Distributed under the terms of the GNU General Public License v2

EAPI=8

DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} pypy3 )

inherit distutils-r1
inherit distutils-r1 pypi

DESCRIPTION="The daff can produce and apply tabular diffs"
HOMEPAGE="https://github.com/paulfitz/daff"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

LICENSE="MIT"
SLOT="0"
Expand Down
4 changes: 2 additions & 2 deletions dev-python/fuo-kuwo/fuo-kuwo-0.1.5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# Distributed under the terms of the GNU General Public License v2

EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )

inherit distutils-r1
inherit distutils-r1 pypi
Copy link
Contributor

Choose a reason for hiding this comment

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

只要用了pypi.eclass就没必要再定义 MY_P 了。因为pypi.eclass会自动根据PEP 625和PEP 440的规则进行normalize,- 在SRC和S里会自动变成下划线 _,再自己定义MY_P完全是跟没写一样

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

原来如此, S="${WORKDIR}/${MY_P}" 也是不需要了吧

Copy link
Contributor

Choose a reason for hiding this comment

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

原来如此, S="${WORKDIR}/${MY_P}" 也是不需要了吧

正是。上面也有说S也会normalize。


DESCRIPTION="kuwo music support for feeluown"
HOMEPAGE="https://github.com/feeluown/feeluown-kuwo"
MY_P="${P/-/_}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"

LICENSE="GPL-3"
SLOT="0"
Expand Down
4 changes: 2 additions & 2 deletions dev-python/fuo-kuwo/fuo-kuwo-0.1.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# Distributed under the terms of the GNU General Public License v2

EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )

inherit distutils-r1
inherit distutils-r1 pypi
Copy link
Contributor

Choose a reason for hiding this comment

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

同上,pypi.eclass下再定义 MY_P 是无用功


DESCRIPTION="kuwo music support for feeluown"
HOMEPAGE="https://github.com/feeluown/feeluown-kuwo"
MY_P="${P/-/_}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"

LICENSE="GPL-3"
SLOT="0"
Expand Down
4 changes: 2 additions & 2 deletions dev-python/fuo-local/fuo-local-0.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# Distributed under the terms of the GNU General Public License v2

EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )

inherit distutils-r1
inherit distutils-r1 pypi
Copy link
Contributor

Choose a reason for hiding this comment

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

同上,pypi.eclass下再定义 MY_P 是无用功


DESCRIPTION="local music support for feeluown"
HOMEPAGE="https://github.com/feeluown/feeluown-local"
MY_P="${P/-/_}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"

LICENSE="GPL-3"
SLOT="0"
Expand Down
2 changes: 1 addition & 1 deletion dev-python/fuo-local/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<!-- maintainer-needed -->
<upstream>
<remote-id type="github">feeluown/feeluown-local</remote-id>
<remote-id type="pypi">feeluown-local</remote-id>
<remote-id type="pypi">fuo-local</remote-id>
</upstream>
</pkgmetadata>
1 change: 0 additions & 1 deletion dev-python/fuo-netease/Manifest
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
DIST fuo_netease-0.9.3.tar.gz 201930 BLAKE2B 23272493ac41c50539ff85735c85f70482938829a825278797d268a4d83eb8bdbac4a76d238500e52cc6122674720cc43717f8eec47843d0a534c0472ad2562f SHA512 2fa5a8bb6e07a6ffe084691709f8f963a2d8920bb9cd72db04241c99631a29dc92afeab9365c5e25c345b1483d7581a3c45ae26f141259372a16b0e597ca42f1
DIST fuo_netease-0.9.4.tar.gz 32991 BLAKE2B 8ca38e6202ad09169a85678e17f1f3fdb1123e33e9e9d65ed6061195249bcb445d7bfb44770511294e9acc7f599fe22e495660cf18935ff0fe6ae029c168fd9c SHA512 11f76786f8c1ef6b19f81c936f8387e9938ee62b07f562cbaff9cc12b4fc6240b0561d3219ac4b447449fe580457019d6d0c5e1433ce1622636f5fd0389e6f6b
33 changes: 0 additions & 33 deletions dev-python/fuo-netease/fuo-netease-0.9.3.ebuild

This file was deleted.

3 changes: 1 addition & 2 deletions dev-python/fuo-netease/fuo-netease-0.9.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )

inherit distutils-r1
inherit distutils-r1 pypi
Copy link
Contributor

Choose a reason for hiding this comment

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

同上,pypi.eclass下再定义 MY_P 是无用功


DESCRIPTION="netease cloud music support for feeluown"
HOMEPAGE="https://github.com/feeluown/feeluown-netease"
MY_P="${P/-/_}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"

LICENSE="GPL-3"
SLOT="0"
Expand Down
4 changes: 2 additions & 2 deletions dev-python/fuo-qqmusic/fuo-qqmusic-0.4.1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# Distributed under the terms of the GNU General Public License v2

EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )

inherit distutils-r1
inherit distutils-r1 pypi
Copy link
Contributor

Choose a reason for hiding this comment

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

同上,pypi.eclass下再定义 MY_P 是无用功


DESCRIPTION="qq music support for feeluown"
HOMEPAGE="https://github.com/feeluown/feeluown-qqmusic"
MY_P="${P/-/_}"
S="${WORKDIR}/${MY_P}"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"

LICENSE="GPL-3"
SLOT="0"
Expand Down
4 changes: 2 additions & 2 deletions dev-python/janus/janus-1.0.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# Distributed under the terms of the GNU General Public License v2

EAPI=7
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} pypy3 )

inherit distutils-r1
inherit distutils-r1 pypi
Copy link
Contributor

Choose a reason for hiding this comment

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

和上面类似,pypi.eclass 会根据 PEP 440的规则把版本号也进行normalize,第12行的 MY_P 定义写了也等于没写


DESCRIPTION="Implementation of the asyncio (PEP 3156) event-loop with Qt"
HOMEPAGE="https://github.com/aio-libs/janus"
MY_P="${P/_alpha/a}"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
IUSE="test"
RESTRICT="!test? ( test )"

Expand Down
4 changes: 2 additions & 2 deletions dev-python/qasync/qasync-0.23.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# Distributed under the terms of the GNU General Public License v2

EAPI=8
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_{9..11} )

inherit distutils-r1
inherit distutils-r1 pypi

DESCRIPTION="Implementation of the asyncio (PEP 3156) event-loop with Qt"
HOMEPAGE="https://github.com/CabbageDevelopment/qasync"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

LICENSE="BSD"
SLOT="0"
Expand Down