From 7f672250728645a48cd320e0040d3f79e9a37a41 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Sat, 8 May 2021 01:40:59 +0000 Subject: Adding metadata --- .../django/files/django-3.0.6-bashcomp.patch | 56 ---------------------- .../freezegun/files/freezegun-1.1.0-py310.patch | 30 ++++++++++++ dev-python/freezegun/freezegun-1.1.0-r1.ebuild | 31 ++++++++++++ .../google-api-python-client-1.8.3-tests.patch | 28 ----------- .../files/nbformat-5.1.2-package-data.patch | 50 ------------------- .../pytest-freezegun/pytest-freezegun-0.4.2.ebuild | 9 +--- 6 files changed, 63 insertions(+), 141 deletions(-) delete mode 100644 dev-python/django/files/django-3.0.6-bashcomp.patch create mode 100644 dev-python/freezegun/files/freezegun-1.1.0-py310.patch create mode 100644 dev-python/freezegun/freezegun-1.1.0-r1.ebuild delete mode 100644 dev-python/google-api-python-client/files/google-api-python-client-1.8.3-tests.patch delete mode 100644 dev-python/nbformat/files/nbformat-5.1.2-package-data.patch (limited to 'dev-python') diff --git a/dev-python/django/files/django-3.0.6-bashcomp.patch b/dev-python/django/files/django-3.0.6-bashcomp.patch deleted file mode 100644 index 2eca3416db68..000000000000 --- a/dev-python/django/files/django-3.0.6-bashcomp.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d082b413b0b6edfcae52f64c8a64f16b2bf6110f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 6 May 2020 07:24:05 +0200 -Subject: [PATCH] Remove completions unsuitable for autoloading - -The override of 'python*' completions, as well as the attempt -to './manage.py' completion are not going to work with autoloader. -Strip them. ---- - extras/django_bash_completion | 33 +-------------------------------- - 1 file changed, 1 insertion(+), 32 deletions(-) - -diff --git a/extras/django_bash_completion b/extras/django_bash_completion -index 3c2f14c263..abe76e5903 100755 ---- a/extras/django_bash_completion -+++ b/extras/django_bash_completion -@@ -37,35 +37,4 @@ _django_completion() - COMP_CWORD=$COMP_CWORD \ - DJANGO_AUTO_COMPLETE=1 $1 ) ) - } --complete -F _django_completion -o default django-admin.py manage.py django-admin -- --_python_django_completion() --{ -- if [[ ${COMP_CWORD} -ge 2 ]]; then -- local PYTHON_EXE=${COMP_WORDS[0]##*/} -- if echo "$PYTHON_EXE" | grep -qE "python([3-9]\.[0-9])?"; then -- local PYTHON_SCRIPT=${COMP_WORDS[1]##*/} -- if echo "$PYTHON_SCRIPT" | grep -qE "manage\.py|django-admin(\.py)?"; then -- COMPREPLY=( $( COMP_WORDS=( "${COMP_WORDS[*]:1}" ) -- COMP_CWORD=$(( COMP_CWORD-1 )) -- DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) ) -- fi -- fi -- fi --} -- --# Support for multiple interpreters. --unset pythons --if command -v whereis &>/dev/null; then -- python_interpreters=$(whereis python | cut -d " " -f 2-) -- for python in $python_interpreters; do -- [[ $python != *-config ]] && pythons="${pythons} ${python##*/}" -- done -- unset python_interpreters -- pythons=$(echo "$pythons" | tr " " "\n" | sort -u | tr "\n" " ") --else -- pythons=python --fi -- --complete -F _python_django_completion -o default $pythons --unset pythons -+complete -F _django_completion -o default django-admin.py django-admin --- -2.26.2 - diff --git a/dev-python/freezegun/files/freezegun-1.1.0-py310.patch b/dev-python/freezegun/files/freezegun-1.1.0-py310.patch new file mode 100644 index 000000000000..41bd7bc2712b --- /dev/null +++ b/dev-python/freezegun/files/freezegun-1.1.0-py310.patch @@ -0,0 +1,30 @@ +From 57d024e4ce2516c55c715448296b9099db68343c Mon Sep 17 00:00:00 2001 +From: Karthikeyan Singaravelan +Date: Fri, 7 May 2021 15:51:33 +0000 +Subject: [PATCH] Fix decorate_class for Python 3.10 where staticmethod is + callable. + +(edited by mgorny for more readable indent) +--- + freezegun/api.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/freezegun/api.py b/freezegun/api.py +index cab9ebe..eb3a931 100644 +--- a/freezegun/api.py ++++ b/freezegun/api.py +@@ -598,7 +598,10 @@ class _freeze_time(object): + continue + seen.add(attr) + +- if not callable(attr_value) or inspect.isclass(attr_value): ++ # staticmethods are callable from Python 3.10 . Hence skip them from decoration ++ if (not callable(attr_value) ++ or inspect.isclass(attr_value) ++ or isinstance(attr_value, staticmethod)): + continue + + try: +-- +2.31.1 + diff --git a/dev-python/freezegun/freezegun-1.1.0-r1.ebuild b/dev-python/freezegun/freezegun-1.1.0-r1.ebuild new file mode 100644 index 000000000000..85b7eea6443d --- /dev/null +++ b/dev-python/freezegun/freezegun-1.1.0-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Let your Python tests travel through time" +HOMEPAGE="https://github.com/spulec/freezegun" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +RDEPEND=" + >dev-python/python-dateutil-2.7[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + dev-python/nose[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/${P}-py310.patch +) diff --git a/dev-python/google-api-python-client/files/google-api-python-client-1.8.3-tests.patch b/dev-python/google-api-python-client/files/google-api-python-client-1.8.3-tests.patch deleted file mode 100644 index ad875e728314..000000000000 --- a/dev-python/google-api-python-client/files/google-api-python-client-1.8.3-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/tests/test_discovery.py b/tests/test_discovery.py -index 6400f214..c999fd4f 100644 ---- a/tests/test_discovery.py -+++ b/tests/test_discovery.py -@@ -40,6 +40,7 @@ import sys - import unittest2 as unittest - - import mock -+import pytest - - import google.auth.credentials - import google_auth_httplib2 -@@ -515,6 +516,7 @@ class DiscoveryFromDocument(unittest.TestCase): - # application default credentials were used. - self.assertNotIsInstance(plus._http, google_auth_httplib2.AuthorizedHttp) - -+ @pytest.mark.skip("Needs network access and credentials") - def test_api_endpoint_override_from_client_options(self): - discovery = open(datafile("plus.json")).read() - api_endpoint = "https://foo.googleapis.com/" -@@ -525,6 +527,7 @@ class DiscoveryFromDocument(unittest.TestCase): - - self.assertEqual(plus._baseUrl, api_endpoint) - -+ @pytest.mark.skip("Needs network access and credentials") - def test_api_endpoint_override_from_client_options_dict(self): - discovery = open(datafile("plus.json")).read() - api_endpoint = "https://foo.googleapis.com/" diff --git a/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch b/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch deleted file mode 100644 index 4fd1de2a942b..000000000000 --- a/dev-python/nbformat/files/nbformat-5.1.2-package-data.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 6dc17e79be58c3cce66256eec2a565692cf95809 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 22 Jan 2021 10:16:24 +0100 -Subject: [PATCH] Fix installing package_data when --build-base is set - -Fix package_data declarations in setup.py to associate every set -of files with its bottommost package. This is necessary for the 'build' -command to install files correctly when --build-base is passed -explicitly. The all-files-for-top-package approach seems to work only -incidentally. - -To reproduce the problem, try: - - setup.py build --build-base=build2 - -and note that none of the data files were installed. ---- - setup.py | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/setup.py b/setup.py -index 22305d3..0a6aa45 100644 ---- a/setup.py -+++ b/setup.py -@@ -34,11 +34,17 @@ for d, _, _ in os.walk(pjoin(here, name)): - packages.append(d[len(here)+1:].replace(os.path.sep, '.')) - - package_data = { -- 'nbformat' : [ -- 'corpus/*.txt' -- 'tests/*.ipynb', -- 'v3/nbformat.v3*.schema.json', -- 'v4/nbformat.v4*.schema.json', -+ 'nbformat.corpus' : [ -+ '*.txt', -+ ], -+ 'nbformat.tests' : [ -+ '*.ipynb', -+ ], -+ 'nbformat.v3' : [ -+ 'nbformat.v3*.schema.json', -+ ], -+ 'nbformat.v4' : [ -+ 'nbformat.v4*.schema.json', - ], - } - --- -2.30.0 - diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild index ce232009dcd8..5855ab0f35b7 100644 --- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild +++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,9 +20,4 @@ RDEPEND=" dev-python/freezegun[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}]" -distutils_enable_tests pytest - -python_test() { - distutils_install_for_testing - pytest -vv || die "Tests failed with ${EPYTHON}" -} +distutils_enable_tests --install pytest -- cgit v1.3