diff --git a/README.md b/README.md index 1e89b89ef..77b01c371 100644 --- a/README.md +++ b/README.md @@ -538,12 +538,12 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E ## Licenses This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted. -There are 1916 Ebuilds in total, 1909 of them have in total 1921 (35 different) licenses assigned. +There are 1914 Ebuilds in total, 1907 of them have in total 1919 (35 different) licenses assigned. |License| Ebuilds using it| |-------|-----| |MIT|1152| -|Apache-2.0|368| +|Apache-2.0|366| |GPL-3|119| |BSD|104| |LGPL-3|29| diff --git a/dev-python/netdisco/Manifest b/dev-python/netdisco/Manifest index 8571f7b27..c782a9d0d 100644 --- a/dev-python/netdisco/Manifest +++ b/dev-python/netdisco/Manifest @@ -1,7 +1,3 @@ -DIST netdisco-2.8.3.tar.gz 30967 BLAKE2B cb85d2c4e3f41288a3a67394e5171b7e68257acc640f06777ad0ed22aa8d59322369ce0153df2f1467627f2dc3a880c09cd022ae3da5d9f18ad48382d86be46f SHA512 b7d6e19fd37b539b3697f63dbb76d425b2549020e72e7a9855cfd56eec5709427dcf4bda97adde031d64041b18e3dc95ea51110299f58342cf11199cb8e1162a -DIST netdisco-2.9.0.tar.gz 31044 BLAKE2B b6ca2f4fab64f142474b542a8f13b35db5ba5d8bbddddbe0aeeab244508baa11edf2c94f076155697fb93d76b791042f6befb9daeca0fe6ec549a215a88da41a SHA512 4617df4e27682262768552b9b99ed76e6d4063bad70c04a1993009a5889c264eccae55792665553e865e9bf4e745b0b5e51463d4e94929284309f426279ee3be DIST netdisco-3.0.0.tar.gz 20413 BLAKE2B bce689834f55c97249b81eb47cf18c6ff71d8c365f4d1ca02f83d741b0810142f4b31775ced00d628d116f91e6150a0de234868d8a8458eaf1d8228d5ab733b8 SHA512 47ec671951b9796316000a6dbf028547fbf2918cdb545868dbfb066d83c2471d123e0865d375feadbdd76321df8c09110520e6c9cf3c6c1dcdaa49a09faf1097 -EBUILD netdisco-2.8.3.ebuild 800 BLAKE2B 18c783ba3370b0764140d104645e0d0f55436425b73e332b60bbd926833027b870a520bd7a794ce4f943d306769f4b98414d6118efca6d9d86c912aae17438a8 SHA512 ac0c016d8c34b9f4113b39fde6a17b27a3b5c035778e0b3f59dde249425ba3f803d64c36e8ab6570c41151cf630f9d841d219e42221d5ae3c3ee564bdb1ef095 -EBUILD netdisco-2.9.0.ebuild 818 BLAKE2B e96c8fa6259f41156d2434f69db075ef4fc351debab5e5437ae1d0fb1d8a283fdee5d0d05549c0262303f354f11aa8e317785a45eed7cae96e934b197920f78a SHA512 74d3c4aa12abdbe4721478e7911dad639b75c02058d2ed4c8b229c7aa846ea9b429c436daea45c0628e9c12ed5f17e5d4db648d9ef97aa8da5d1d35e346b7bbe -EBUILD netdisco-3.0.0.ebuild 818 BLAKE2B e96c8fa6259f41156d2434f69db075ef4fc351debab5e5437ae1d0fb1d8a283fdee5d0d05549c0262303f354f11aa8e317785a45eed7cae96e934b197920f78a SHA512 74d3c4aa12abdbe4721478e7911dad639b75c02058d2ed4c8b229c7aa846ea9b429c436daea45c0628e9c12ed5f17e5d4db648d9ef97aa8da5d1d35e346b7bbe +EBUILD netdisco-3.0.0-r1.ebuild 823 BLAKE2B 9437cddc8106297fd9cb3b6512175db8448344d8ff3ff1222a8ec026f63e8f9994a2f8ae9c74c6341d5592916d56b417df65cf9a2212e09a6b9cad59fed8f6a8 SHA512 a17d4d696a01058a91879685cc511c7d04a52369dda0ca1f6ec7517c35ea08c6e803711fb7552ac639d9234275669b5794354bdf0213ae35563113c2096e95fc MISC metadata.xml 462 BLAKE2B e5643b396bbad7c81357b8d5892204107f6fbb3f12af14ec150b7bf2a3982721c07b72183ee634964fb2bf1bb9c79a1fa5854b7954dd00593b86cb98887da73a SHA512 a0b34a6cc4e2636dc2fc6e50850e200e651a94011b408a06cd21ef247ea198037ec33164197b967394bf3eae1da84cf364754532031e0d4881f1e254ba02cd2c diff --git a/dev-python/netdisco/netdisco-2.8.3.ebuild b/dev-python/netdisco/netdisco-2.8.3.ebuild deleted file mode 100644 index 9b88e83e8..000000000 --- a/dev-python/netdisco/netdisco-2.8.3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -DESCRIPTION="Discover devices on your local network" -HOMEPAGE="https://github.com/home-assistant/netdisco https://pypi.org/project/netdisco/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 amd64-linux x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}] - >=dev-python/zeroconf-0.30.0[${PYTHON_USEDEP}]" -BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - nosetests --verbose || die - py.test -v -v || die -} diff --git a/dev-python/netdisco/netdisco-2.9.0.ebuild b/dev-python/netdisco/netdisco-3.0.0-r1.ebuild similarity index 82% rename from dev-python/netdisco/netdisco-2.9.0.ebuild rename to dev-python/netdisco/netdisco-3.0.0-r1.ebuild index 4db3cd47b..562b4bb8a 100644 --- a/dev-python/netdisco/netdisco-2.9.0.ebuild +++ b/dev-python/netdisco/netdisco-3.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit distutils-r1 @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 amd64-linux x86-linux" +KEYWORDS="amd64 arm arm64 x86" IUSE="test" RESTRICT="!test? ( test )" @@ -32,3 +32,5 @@ python_test() { nosetests --verbose || die py.test -v -v || die } + +distutils_enable_tests pytest diff --git a/dev-python/netdisco/netdisco-3.0.0.ebuild b/dev-python/netdisco/netdisco-3.0.0.ebuild deleted file mode 100644 index 4db3cd47b..000000000 --- a/dev-python/netdisco/netdisco-3.0.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -DESCRIPTION="Discover devices on your local network" -HOMEPAGE="https://github.com/home-assistant/netdisco https://pypi.org/project/netdisco/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 amd64-linux x86-linux" -IUSE="test" -RESTRICT="!test? ( test )" - -DOCS="README.md" - -RDEPEND=">=dev-python/requests-2.0[${PYTHON_USEDEP}] - >=dev-python/zeroconf-0.30.0[${PYTHON_USEDEP}]" -BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - )" - -python_test() { - nosetests --verbose || die - py.test -v -v || die -}