From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- dev-python/flask/Manifest | 11 ++++---- dev-python/flask/files/flask-1.1.1-py38.patch | 38 +++++++++++++++++++++++++++ dev-python/flask/flask-0.12.2.ebuild | 1 + dev-python/flask/flask-1.0.2.ebuild | 3 ++- dev-python/flask/flask-1.0.4.ebuild | 1 + dev-python/flask/flask-1.1.1.ebuild | 22 +++++++--------- dev-python/flask/flask-9999.ebuild | 19 ++++---------- 7 files changed, 62 insertions(+), 33 deletions(-) create mode 100644 dev-python/flask/files/flask-1.1.1-py38.patch (limited to 'dev-python/flask') diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest index 482edcb5aff1..6121e189b2a1 100644 --- a/dev-python/flask/Manifest +++ b/dev-python/flask/Manifest @@ -1,10 +1,11 @@ +AUX flask-1.1.1-py38.patch 1134 BLAKE2B bc252d38ca5c49ac7a327b50ee62eccb26a81f041a81fb6996fba790a6ec0f11b004fe90917ef4d90238126a17bb9864f81843f41edc7e43795acfb382799482 SHA512 ce43cf60c59aa17c716802779c163231435310b1942dd02373da51658119922bd6707b910c23dea49a9727f5a6a82219893ad3918384e7ebe3b5025bb4f7a6db DIST Flask-0.12.2.tar.gz 548510 BLAKE2B bd92d0e7e6ff36d371ffd958708517d16e41d1475af9153bf3d5234c33aa5c0ab415cbd254b711731cf8cffddac94b475f62d9fff2f9fe756b0fa30bb36d4343 SHA512 c00bb807e8fbc943e23a3721acf5b04320e7a58d658bca46bdf83a345b4c4d5729accae338505e134f01bc908adec9555fd94e8c87ef6f0367e6037215c06319 DIST Flask-1.0.2.tar.gz 644534 BLAKE2B dd024f6f7a68691c759e3fd494a9482c4ab5216b5c7486fc1717346f953678c3198deedd657e7ddd3a5deff57ce31b1afdc40ef2ba9cc2fbed48f3afc223f6d0 SHA512 0ddf5d8bb0b0ae61f990096dffe3cf02744d7986015d05ae2cc09dfe0def17df44e2a4c58e330d17c7bd8c3eb74014dee5e2edef6e300b8e4ed756c251938f52 DIST Flask-1.0.4.tar.gz 615497 BLAKE2B 4141de3754a8ce42c6978a72da80c991d13415a19946180f5fd8f08a1827209be605ec10283b78841bee94c5a2036b8e6083187a3e68c188fde93cb702a6d645 SHA512 2ed45ebdef80fe354a0a221f991560e17c442550f667fb76dd9c9631428fe8b6686127504f4ee81fcc6748f99cd376bed7a1ff4e0a9ae913cd70c9f5f4ac1c61 DIST Flask-1.1.1.tar.gz 625458 BLAKE2B aea56848dd1f8bb2d96059adf069f8d19c55395e5dd0d98bf4e89c7d1b54241f1f476cbf7fdb91a2390cb5438a3bd7a5bdb58383f2a196b042e90f272cb39e53 SHA512 d4e6304bdb2e20deda5b9800dc9ebeabf0442528d6cef2d15416129c151b25ab32c41460939f64fb72b15ead8d4e9bcea5694039323d080d279bfba2f6266178 -EBUILD flask-0.12.2.ebuild 1832 BLAKE2B 3842b508f228388958d8f88cfa8379bbbefdb4dcb1946fb1ece67b3cd7339fcdb2d7674663381023d68e1355cbcfc2df1f2a6c40f2fa357f29029596d0f4768b SHA512 a05a66316c2727d75bdc7dc65616256241afa69fa83fff57e88ca25cce6f258b3f40950b1a38b9fe58799329441b8124f2bcfa2bec66f10b196dc6c13e5ffb52 -EBUILD flask-1.0.2.ebuild 1539 BLAKE2B 5e6d5e28412eed92ec448547a3a23335172d6d47fe551eeb0a2071ac81c12c6173f6b02d4953a3a56c529b27729fcdd1593e97b84b5c6a10b2aa9dfc6cc5aaa4 SHA512 4d7f130fc985b4dff5a488c2f34511a12fb6020e6cb3bc065273e2b9d55cdfed747e7ecfe90cad69246f4bf2f2266b7671127f5ddbb5a403ac6471eda7a9c1cf -EBUILD flask-1.0.4.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77 -EBUILD flask-1.1.1.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77 -EBUILD flask-9999.ebuild 1544 BLAKE2B 38e1bf11882f98b282a0c6e107bbb02f50fc96912b87d8902b678a534354a8040d3c9af36d04686fa727c714677efb7f12552ac03e34cbb9c9b8f7d53228d4dc SHA512 49a45558f158e4ee72732288bb22912278b01a59c3e60d443db2638c4ece8a0b5e490bb437af2370379f09cdaaff8a82a7952d311ee76b967dd4cea3ea672d77 +EBUILD flask-0.12.2.ebuild 1859 BLAKE2B 1bcbbcdcbd8e218ed3257d82a50589b65cfeba01ace28147fc87947ca2738651c95df23fdcd484cb8e02ae431c44e6c60e0e08a6ba12fdb2bc5eda146b3df0e5 SHA512 e979ec60cb50f9a3f50ce26684cfece39fd69e3ff206b934e98fb9f0f536eba468baee44c32d3cbbc7ab8c9445fad635f8b191f1566112386bf21c7ffed34e81 +EBUILD flask-1.0.2.ebuild 1565 BLAKE2B fc51858e265bbbe881bc0dcfebb291284a8d546a9df87adb2a85d738d5427809571e430e17edbb5e1e97adc4b41d8c6e24f08b51ae661b2b3c803b8b78af0d8d SHA512 aae80a325018bd4d51044fd72a753a1e74d553eace6c18159c3c9edcbab69ff4217f43b104d95d0e9108d66cca061bb7108a4d8ac130055571e5804a380b7e0a +EBUILD flask-1.0.4.ebuild 1571 BLAKE2B 14d9e4068ee905140e4a5d632abdefd6e58486a9e62aeebda4745d93c391e34955bf52da6315920cc979d6ba9c66cd995e0f29d764a9e6dea13fa735f32fe810 SHA512 adababc193243e801bea4f22555716fc05709fe7ca224a117b8835ff91f70839302d258ceb96180248bc8f91ec82b5c14e96e64ed1d73d46f7232ea3f02781ff +EBUILD flask-1.1.1.ebuild 1414 BLAKE2B 5cf87a0f7121747ec886a3f2693b51e1973593f826610556ce9482c470582a896ce194daad116f6c61f21d44502af4c57664fb9d944039b78a7c6a7a39cc5114 SHA512 e057cff790f820e1e5dc1366b61606731559d9baea415348a2643bfff2b7220d7a0e7c42090138e55af69f8fd9dd75aa28c3ed44c961c7cdd635758f0afa4795 +EBUILD flask-9999.ebuild 1311 BLAKE2B 531cc5b3b8e0c21e5a255880eec7ec7c5d1df3f4b3265bc1e10b4eb21aba884c4aeaab475916cfeb63a7577cade27152f4d377dc52ae1e874e8270eab5b63689 SHA512 0e34fe92867543d812c61a6c40f3b27fb21d3c647c1a5b3afb1ca92fe1bcfbab24230331c2c926039fa49ff611772afb9eacf2fe4f86ae714b2b3ffb922422f6 MISC metadata.xml 363 BLAKE2B f031e9e0d44bc626f4cc00538e6030e732f97286a09d061cfd8b7e03c8506cc9ddc8caab73d9c10363c5bd0eab1bfe6129a668bd6c66e3d82d9221cfd1175629 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6 diff --git a/dev-python/flask/files/flask-1.1.1-py38.patch b/dev-python/flask/files/flask-1.1.1-py38.patch new file mode 100644 index 000000000000..a03aa445137b --- /dev/null +++ b/dev-python/flask/files/flask-1.1.1-py38.patch @@ -0,0 +1,38 @@ +commit c367a86cc5be70da4928b276d0218f98df6e854d +Author: Fernanda Guimarães +Date: Mon Oct 28 21:37:25 2019 -0300 + + Test test_send_from_directory_bad_request no longer fails in Python 3.8. + +diff --git a/tests/test_helpers.py b/tests/test_helpers.py +index 78a56221..21735af1 100644 +--- a/tests/test_helpers.py ++++ b/tests/test_helpers.py +@@ -11,6 +11,7 @@ + import datetime + import io + import os ++import sys + import uuid + + import pytest +@@ -780,12 +781,17 @@ class TestSendfile(object): + assert rv.data.strip() == b"Hello Subdomain" + rv.close() + +- def test_send_from_directory_bad_request(self, app, req_ctx): ++ def test_send_from_directory_null_character(self, app, req_ctx): + app.root_path = os.path.join( + os.path.dirname(__file__), "test_apps", "subdomaintestmodule" + ) + +- with pytest.raises(BadRequest): ++ if sys.version_info >= (3, 8): ++ exception = NotFound ++ else: ++ exception = BadRequest ++ ++ with pytest.raises(exception): + flask.send_from_directory("static", "bad\x00") + + diff --git a/dev-python/flask/flask-0.12.2.ebuild b/dev-python/flask/flask-0.12.2.ebuild index e5a7abba8cf5..910edf128854 100644 --- a/dev-python/flask/flask-0.12.2.ebuild +++ b/dev-python/flask/flask-0.12.2.ebuild @@ -23,6 +23,7 @@ fi LICENSE="BSD" SLOT="0" IUSE="doc examples test" +RESTRICT="!test? ( test )" RDEPEND=">=dev-python/click-2[${PYTHON_USEDEP}] >=dev-python/blinker-1[${PYTHON_USEDEP}] diff --git a/dev-python/flask/flask-1.0.2.ebuild b/dev-python/flask/flask-1.0.2.ebuild index 9ac665ced8d5..c7d90235cdb5 100644 --- a/dev-python/flask/flask-1.0.2.ebuild +++ b/dev-python/flask/flask-1.0.2.ebuild @@ -16,13 +16,14 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" fi LICENSE="BSD" SLOT="0" IUSE="doc examples test" +RESTRICT="!test? ( test )" RDEPEND="dev-python/click[${PYTHON_USEDEP}] dev-python/blinker[${PYTHON_USEDEP}] diff --git a/dev-python/flask/flask-1.0.4.ebuild b/dev-python/flask/flask-1.0.4.ebuild index 80cc931b35be..309a5494f244 100644 --- a/dev-python/flask/flask-1.0.4.ebuild +++ b/dev-python/flask/flask-1.0.4.ebuild @@ -23,6 +23,7 @@ fi LICENSE="BSD" SLOT="0" IUSE="doc examples test" +RESTRICT="!test? ( test )" RDEPEND="dev-python/click[${PYTHON_USEDEP}] dev-python/blinker[${PYTHON_USEDEP}] diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild index 80cc931b35be..3cfa93664536 100644 --- a/dev-python/flask/flask-1.1.1.ebuild +++ b/dev-python/flask/flask-1.1.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) inherit distutils-r1 @@ -22,7 +22,8 @@ fi LICENSE="BSD" SLOT="0" -IUSE="doc examples test" +IUSE="examples test" +RESTRICT="!test? ( test )" RDEPEND="dev-python/click[${PYTHON_USEDEP}] dev-python/blinker[${PYTHON_USEDEP}] @@ -31,27 +32,22 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}] >=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die - distutils-r1_python_prepare_all -} +PATCHES=( + # taken from upstream git, will be in next release + "${FILESDIR}/flask-1.1.1-py38.patch" +) -python_compile_all() { - use doc && emake -C docs html -} +distutils_enable_sphinx docs python_test() { PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \ - py.test -v || die "Testing failed with ${EPYTHON}" + pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}" } python_install_all() { use examples && dodoc -r examples - use doc && HTML_DOCS=( docs/_build/html/. ) distutils-r1_python_install_all } diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild index 80cc931b35be..ab417690d6fe 100644 --- a/dev-python/flask/flask-9999.ebuild +++ b/dev-python/flask/flask-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) inherit distutils-r1 @@ -22,7 +22,8 @@ fi LICENSE="BSD" SLOT="0" -IUSE="doc examples test" +IUSE="examples test" +RESTRICT="!test? ( test )" RDEPEND="dev-python/click[${PYTHON_USEDEP}] dev-python/blinker[${PYTHON_USEDEP}] @@ -31,27 +32,17 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}] >=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} +distutils_enable_sphinx docs python_test() { PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \ - py.test -v || die "Testing failed with ${EPYTHON}" + pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}" } python_install_all() { use examples && dodoc -r examples - use doc && HTML_DOCS=( docs/_build/html/. ) distutils-r1_python_install_all } -- cgit v1.2.3