Merge pull request EESSI#66 from bedroge/archspec_improvements

Improvements for archspec ebuild

sys-apps/archspec/Manifest

@@ -1,7 +1,8 @@
 DIST archspec-0.1.1.tar.gz 25675 BLAKE2B 89a4dd85bdf4cac2ad0b84a754a2486a38b28e219c68169dd372f2153be2cbd61e5330ea10cf5cf6a06c7deb3678ace929ee8503d829bfe364c43c39738757a2 SHA512 51560206bd01b21efe781e3be833362b94e6c0ccaea9759ab69ea97746ce4804b7e5e1181f39b9ea06a38f1baa027ad4fdefd9ffe2cf1e3a7fbcf466c925f02d
 DIST archspec-0.1.2.tar.gz 31160 BLAKE2B ed543e113e68ec6026d09595b25e4e45301c48ebf7b4b072f109a5cb1af88dffd0dcedf05c99cd2af9badcd1cf8bbcb1bca45e3e5c354cb489efbb2d3b5fecb6 SHA512 b10d94bef775ff02d5801744b59d3c6db60748eb4057c3465b55d3d831013abff53f64e63c6a6f1115dba9ae21b1d56fcd23daa263b6886f0ae1222ef5f4bc7a
-DIST archspec-0.1.3.tar.gz 33498 BLAKE2B ecd6fa9aeb86ecc4271a4269690f21f3d8a6244e879dadd47a05a2d7b09c98fbf9b9c95bad99ee4e08a87669ba420743c2646d730cf7554b67b893e56e1e0a77 SHA512 8bb1440de43c4fedc7f85a5a087ef0f982f2c12d233a3d221a0bf1fc6960330bd03404ba83ce5f144b569166934cd2c9184cf0e4fbcb8fb4ea03f4ca6f1ef32d
+DIST archspec-0.1.3.tar.gz 25371 BLAKE2B 58cc0d739b2cf9a89a85c89163651b9a39f5435810826c43c6a464ad6cfd2ba13aa6cbd7082d899d1d44df54eb51ee4ec0d7ebbbd0171e77dfbe64e9241bc784 SHA512 170984364194dba62918f3db6c0404119332bab37221c24cad37cd025726ca9489454a386d1fa730c59f122914759a1962bb6402df977ae3fa7d5746f735051d
+DIST archspec-json-0.1.3.tar.gz 15675 BLAKE2B 15b089012e91b0c0a595ef0aadbac7c4fec50778169b4bc3edf72cb47d1688c9ff721352f8c5328b81ed706cf1cff51d823f11f36a6e41220449617b2c0e2c5d SHA512 d85737a04d51623f1d3a34915784b6a4a3d9d052fa708af01164a013f44452eb384f079c17d90af82a867b452dd4ded22fdbf3113ed0d73c533da81b09315ff4
 EBUILD archspec-0.1.1.ebuild 679 BLAKE2B 7e377d2e4198f5e55c7b65310c93a30f86615cc8f7d98aa0472c03c06b09a49b156221ca71d4d89ae091e0f2dd59e5d1b1677cb9768d8e5916cdd31eecbefefa SHA512 a6fba71a72be0b3063a596cf984f22c7f9eebf59a45fb6d7e8bee943606197b69a593bebc768759ea0ba6f8c59a1f78f62a7cc4be8a4b3ca7aa83f2183efa970
 EBUILD archspec-0.1.2.ebuild 697 BLAKE2B 0b2a7e24f58bbbd0a556e0f520e820aa134088a11a2f339b53df939a21839683454166e1b841c9500d5d6ce3c0e47aa86c63b3f4679fcc551a889b51790742af SHA512 7c99a704765a02faff73cc66a9f8e2d9418ee0ef7c71a01df07e715b69b6e8c71bf241007a7e24b4732b09eeb548d89844833019bea175b676c1f6aaf0866c3d
-EBUILD archspec-0.1.3.ebuild 693 BLAKE2B 552c3e646f8b347a75ff5a1d70558fd0e217ba630fa581978cd4de9a4b7f6916e34ec2f01ad9c013cf2a9675d8b9389531dc23c305f136f42431b89d72c1f3d4 SHA512 cf54a4a5c59a8e9c03d6a2a5cdc81f9252651c3149d5360999641dc469b7a94abbfbc34d70fa59b580763deeb73bf98efa6f3bc128ee4aac882af41111686cee
+EBUILD archspec-0.1.3.ebuild 1219 BLAKE2B bc0e86eb1ba4e7a841ad85ac5f9b5fd7f22db1f80b950692d85c6218613fb56ccb824d2759e67c5d0de55d511a16a2c3e7b59b7d815ff384ce74ce25cc19448d SHA512 a6a1a599a17b78eecc7591a61c8cf801dccf32658b15e226259181554a417d087621ba80ca0d83ccfb37b38d573a30c2dcd777a528c00ea279379b9631c8aef7
 MISC metadata.xml 451 BLAKE2B f09fad58ea6ec4581d30bb10015c22a8b3f342ce77cc3042f1254ddcaf56c6d7d302f068a7f093ea683ae207cc07be450a7a12c1a25cd625187962891536ea92 SHA512 6ef7183e8ad992332da9c0392333fd48fba1f6c60e53b41fa0f2c5f01b6b87a57649d29b1d7956ccee0fe84555cc27ab04728b39cf203f7b3b116c95252e3725

sys-apps/archspec/archspec-0.1.3.ebuild

@@ -4,23 +4,29 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..10} )
-
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 inherit distutils-r1
 
-#DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-
 DESCRIPTION="A library to query system architecture"
 HOMEPAGE="https://github.com/archspec/archspec"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# Use the tarball from GitHub, as the one from PyPI does not contain the tests.
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# The tarball from GitHub does not contain the archspec microarchitectures data file,
+# which is part of the archspec-json repository. So, we need to download that tarball as well.
+ARCHSPEC_JSON="${PN}-json-${PV}.tar.gz"
+SRC_URI+=" https://github.com/${PN}/${PN}-json/archive/v${PV}.tar.gz -> ${ARCHSPEC_JSON}"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE=""
 
-#DEPEND="dev-python/pyproject2setuppy[${PYTHON_USEDEP}]
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>dev-python/six-1.13[${PYTHON_USEDEP}]
+RDEPEND=">dev-python/six-1.13[${PYTHON_USEDEP}]
 	<dev-python/click-8.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-BDEPEND=""
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	# Extract the archspec-json file into the right subdirectory of the archspec sources.
+	tar -C "${P}"/"${PN}"/json --strip-components=1 -xzf "${DISTDIR}/${ARCHSPEC_JSON}" || die
+}