From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B33CE1580B9 for ; Fri, 27 Aug 2021 16:52:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0087E0837; Fri, 27 Aug 2021 16:52:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0716E0837 for ; Fri, 27 Aug 2021 16:52:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B9C3335D88 for ; Fri, 27 Aug 2021 16:52:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8141126 for ; Fri, 27 Aug 2021 16:52:30 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1630083142.78f1e8999a8ca59dab5e4789f505013fca14f2d4.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/qtsass/, dev-python/qtsass/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/qtsass/files/qtsass-0.3.0-fix-py3.10.patch dev-python/qtsass/qtsass-0.3.0.ebuild X-VCS-Directories: dev-python/qtsass/files/ dev-python/qtsass/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 78f1e8999a8ca59dab5e4789f505013fca14f2d4 X-VCS-Branch: master Date: Fri, 27 Aug 2021 16:52:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f428a837-7b62-4d4d-9387-e2df322df9d1 X-Archives-Hash: 52a26a6d96fe0721d2239f075a0c4d46 commit: 78f1e8999a8ca59dab5e4789f505013fca14f2d4 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Aug 27 16:51:20 2021 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Fri Aug 27 16:52:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f1e899 dev-python/qtsass: enable py3.10 Signed-off-by: Arthur Zamarin gentoo.org> .../qtsass/files/qtsass-0.3.0-fix-py3.10.patch | 37 ++++++++++++++++++++++ dev-python/qtsass/qtsass-0.3.0.ebuild | 18 ++++++----- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dev-python/qtsass/files/qtsass-0.3.0-fix-py3.10.patch b/dev-python/qtsass/files/qtsass-0.3.0-fix-py3.10.patch new file mode 100644 index 00000000000..4aa3342170e --- /dev/null +++ b/dev-python/qtsass/files/qtsass-0.3.0-fix-py3.10.patch @@ -0,0 +1,37 @@ +From cbea8d8729282106373a12b9e08bcaac8abeb52f Mon Sep 17 00:00:00 2001 +From: goanpeca +Date: Tue, 24 Mar 2020 11:51:28 -0500 +Subject: [PATCH] Add check for deprecated api between 2 and 3 versions + +--- + qtsass/api.py | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/qtsass/api.py b/qtsass/api.py +index 7ea4138..7a65fe2 100644 +--- a/qtsass/api.py ++++ b/qtsass/api.py +@@ -13,9 +13,9 @@ + from __future__ import absolute_import, print_function + + # Standard library imports +-from collections import Mapping, Sequence + import logging + import os ++import sys + + # Third party imports + import sass +@@ -26,6 +26,12 @@ + from qtsass.importers import qss_importer + + ++if sys.version_info[0] == 3: ++ from collections.abc import Mapping, Sequence ++else: ++ from collections import Mapping, Sequence ++ ++ + # yapf: enable + + # Constants diff --git a/dev-python/qtsass/qtsass-0.3.0.ebuild b/dev-python/qtsass/qtsass-0.3.0.ebuild index 3409b05d808..ef7668b644d 100644 --- a/dev-python/qtsass/qtsass-0.3.0.ebuild +++ b/dev-python/qtsass/qtsass-0.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_USE_SETUPTOOLS=rdepend @@ -17,13 +17,15 @@ LICENSE="MIT" SLOT="0" KEYWORDS="amd64 x86" -DEPEND="dev-python/libsass[${PYTHON_USEDEP}]" +RDEPEND="dev-python/libsass[${PYTHON_USEDEP}]" + +PATCHES=( + "${FILESDIR}/${P}-fix-py3.10.patch" +) distutils_enable_tests pytest -python_prepare_all() { +EPYTEST_DESELECT=( # assert 1 == 2 - sed -i -e 's:test_watchers:_&:' tests/test_watchers.py || die - - distutils-r1_python_prepare_all -} + tests/test_watchers.py::test_watchers +)