commit: 49c4e2a0ee5c6441abc443d376280abc0c320c75 Author: Louis Sautier <sbraz <AT> gentoo <DOT> org> AuthorDate: Sun Aug 29 00:47:15 2021 +0000 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org> CommitDate: Sun Aug 29 01:02:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49c4e2a0
profiles: mask dev-python/setuptools_scm-6.1.0 in addition to 6.2.0 Upstream confirms that both versions have several bugs and have been pulled off PyPI: https://github.com/pypa/setuptools_scm/issues/615#issuecomment-907690841 This also lifts the version restriction added to dev-python/setuptools_scm_git_archive in e313b122eafeef2984f716c90baa99235eae78a6 since the problematic version is now masked. Bug: https://bugs.gentoo.org/810808 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org> ...chive-1.1-r1.ebuild => setuptools_scm_git_archive-1.1-r2.ebuild} | 4 +--- profiles/package.mask | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r1.ebuild b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r2.ebuild similarity index 81% rename from dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r1.ebuild rename to dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r2.ebuild index dfa9daf7406..47aa91fa85d 100644 --- a/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r1.ebuild +++ b/dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r2.ebuild @@ -15,10 +15,8 @@ SLOT="0" KEYWORDS="amd64 arm ~arm64 ~ppc64 x86" IUSE="" -# At the moment, newer versions of setuptools_scm break this package: -# https://bugs.gentoo.org/810808 RDEPEND=" - <dev-python/setuptools_scm-6.1.0[${PYTHON_USEDEP}] + dev-python/setuptools_scm[${PYTHON_USEDEP}] " BDEPEND="${RDEPEND}" diff --git a/profiles/package.mask b/profiles/package.mask index 060db403975..85571c048e8 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,9 +33,9 @@ #--- END OF EXAMPLES --- # Arthur Zamarin <[email protected]> (2021-08-28) -# Upstream changed toml to tomli handling, which resulted in a lot of -# breakage in various packages. -# Reported upstream in https://github.com/pypa/setuptools_scm/issues/611 +# Both versions have several bugs and have been pulled off PyPI +# Bugs #810808 and #810790. +=dev-python/setuptools_scm-6.1.0 =dev-python/setuptools_scm-6.2.0 # Stephan Hartmann <[email protected]> (2021-08-28)
