diff options
| author | Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> | 2020-09-12 12:27:46 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> | 2020-09-12 12:27:46 +0000 |
| commit | 16d68a404ce1253222ededb357626b11f89b6cce (patch) | |
| tree | c2d52b863c172ade3aecd3bb05a645f20840608f /dev-python | |
| parent | 8f47265f49d48350aa1b36353b8b3ac22884ca72 (diff) | |
| download | baldeagleos-repo-16d68a404ce1253222ededb357626b11f89b6cce.tar.gz baldeagleos-repo-16d68a404ce1253222ededb357626b11f89b6cce.tar.xz baldeagleos-repo-16d68a404ce1253222ededb357626b11f89b6cce.zip | |
Updating liguros repo
Diffstat (limited to 'dev-python')
23 files changed, 54 insertions, 644 deletions
diff --git a/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch b/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch deleted file mode 100644 index 575c8abbb744..000000000000 --- a/dev-python/argcomplete/files/argcomplete-1.11.1-fish-xpass.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 08bfc8a788e8081515d733e67be026d051c726f7 Mon Sep 17 00:00:00 2001 -From: Evan <evanunderscore@gmail.com> -Date: Thu, 19 Mar 2020 14:55:07 +1100 -Subject: [PATCH] Remove expected test failure for new versions of fish (#292) - ---- - test/test.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/test/test.py b/test/test.py -index e91352b..2c34806 100755 ---- a/test/test.py -+++ b/test/test.py -@@ -28,6 +28,8 @@ - - BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode() - BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0]) -+FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $FISH_VERSION']).decode() -+FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.')) - - - class TempDir(object): -@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase): - expected_failures = [ - 'test_parse_special_characters', - 'test_comp_point', -- 'test_special_characters_double_quoted' - ] -+ if FISH_VERSION_TUPLE < (3, 1): -+ expected_failures.extend([ -+ 'test_special_characters_double_quoted' -+ ]) - - skipped = [ - 'test_single_quotes_in_single_quotes', diff --git a/dev-python/cryptography/cryptography-3.0.ebuild b/dev-python/cryptography/cryptography-3.0.ebuild index e628a8737b20..0729519f07d0 100644 --- a/dev-python/cryptography/cryptography-3.0.ebuild +++ b/dev-python/cryptography/cryptography-3.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz LICENSE="|| ( Apache-2.0 BSD )" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="libressl idna test" RESTRICT="!test? ( test )" diff --git a/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch b/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch deleted file mode 100644 index f00d5a15538b..000000000000 --- a/dev-python/dogpile-cache/files/dogpile-cache-1.0.1-install-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 559a5c57c922741461d419b73f1aa547e3231110 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 3 Aug 2020 08:50:33 +0200 -Subject: [PATCH] Exclude installing "tests" package from setup.py - ---- - setup.cfg | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/setup.cfg b/setup.cfg -index ab4008f..2f43889 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -30,6 +30,11 @@ python_requires = >=3.6 - package_dir = - =. - -+[options.packages.find] -+exclude = -+ tests -+ tests.* -+ - [options.exclude_package_data] - '' = tests* - --- -2.28.0 - diff --git a/dev-python/filetype/files/filetype-1.0.5-examples.patch b/dev-python/filetype/files/filetype-1.0.5-examples.patch deleted file mode 100644 index 3032c38a6995..000000000000 --- a/dev-python/filetype/files/filetype-1.0.5-examples.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/setup.py 2020-02-07 15:57:33.445851327 -0000 -+++ b/setup.py 2020-02-07 15:57:50.921877837 -0000 -@@ -37,6 +37,6 @@ - 'Topic :: System :: Filesystems', - 'Topic :: Utilities'], - platforms=['any'], -- packages=find_packages(exclude=['dist', 'build', 'docs', 'tests']), -+ packages=find_packages(exclude=['dist', 'build', 'docs', 'tests', 'examples']), - package_data={'filetype': ['LICENSE', '*.md']}, - zip_safe=True) diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest new file mode 100644 index 000000000000..ee9d97ab0a94 --- /dev/null +++ b/dev-python/flask-compress/Manifest @@ -0,0 +1 @@ +DIST Flask-Compress-1.5.0.tar.gz 6473 BLAKE2B eba68544018d587a7651c07739ac14218ff9918031fee740893245816daa7494d4998cf60b533971ba8dc0c7c9e3d1e1c14ee746d9e29deab70b30478a3c4eae SHA512 fe2d1dfef8be8d04b78a2938dd52a1f6068e6c35741f593fbb0d3d050b789b8d70188d683f7028b92a180653afda0566bda29b82475b20444f6563c8620ff1ec diff --git a/dev-python/flask-compress/flask-compress-1.5.0.ebuild b/dev-python/flask-compress/flask-compress-1.5.0.ebuild new file mode 100644 index 000000000000..2e6a0f039e33 --- /dev/null +++ b/dev-python/flask-compress/flask-compress-1.5.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9} ) + +inherit distutils-r1 + +MY_PN="Flask-Compress" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Compress responses in your Flask app with gzip" +HOMEPAGE="https://pypi.org/project/Flask-Compress" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RDEPEND=" + app-arch/brotli[python,${PYTHON_USEDEP}] + dev-python/flask[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] +" + +DEPEND=" + ${RDEPEND} + test? ( dev-python/pytest[${PYTHON_USEDEP}] )" + +S="${WORKDIR}/${MY_P}" + +python_test() { + pytest +} diff --git a/dev-python/flask-compress/metadata.xml b/dev-python/flask-compress/metadata.xml new file mode 100644 index 000000000000..0cdfceeff025 --- /dev/null +++ b/dev-python/flask-compress/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>python@gentoo.org</email> + <name>Python</name> + </maintainer> + <maintainer type="person"> + <email>titanofold@gentoo.org</email> + <name>Aaron W. Swenson</name> + </maintainer> + <upstream> + <remote-id type="pypi">Flask-Gravatar</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata> diff --git a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch deleted file mode 100644 index 82a371c72978..000000000000 --- a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch +++ /dev/null @@ -1,39 +0,0 @@ - setupinfo.py | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/setupinfo.py b/setupinfo.py -index e04c38f..0549eaa 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -93,19 +93,6 @@ def ext_modules(static_include_dirs, static_library_dirs, - source_extension = ".c" - print("Building without Cython.") - -- lib_versions = get_library_versions() -- versions_ok = True -- if lib_versions[0]: -- print("Using build configuration of libxml2 %s and libxslt %s" % -- lib_versions) -- versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2') -- else: -- print("Using build configuration of libxslt %s" % -- lib_versions[1]) -- versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt') -- if not versions_ok: -- raise RuntimeError("Dependency missing") -- - base_dir = get_base_dir() - _include_dirs = _prefer_reldirs( - base_dir, include_dirs(static_include_dirs) + [INCLUDE_PACKAGE_PATH]) -@@ -358,8 +345,9 @@ def get_library_versions(): - - - def flags(option): -- xml2_flags = run_command(find_xml2_config(), "--%s" % option) -- xslt_flags = run_command(find_xslt_config(), "--%s" % option) -+ pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') -+ xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option) -+ xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option) - - flag_list = xml2_flags.split() - for flag in xslt_flags.split(): diff --git a/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch b/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch deleted file mode 100644 index ff8388988ad1..000000000000 --- a/dev-python/m2crypto/files/m2crypto-crossdev-0.31.0.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -50,7 +50,8 @@ - '*Visual*', 'VC', 'include') - err = glob.glob(globmask) - else: -- pid = subprocess.Popen(['cpp', '-Wp,-v', '-'], -+ pid = subprocess.Popen(os.environ.get('CPP', 'cpp').split() + -+ ['-Wp,-v', '-'], - stdin=open(os.devnull, 'r'), - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) diff --git a/dev-python/notebook/files/notebook-5.0.0-example-execution.patch b/dev-python/notebook/files/notebook-5.0.0-example-execution.patch deleted file mode 100644 index 4516cadf11f6..000000000000 --- a/dev-python/notebook/files/notebook-5.0.0-example-execution.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit db90e16d17acc778efdfff6dca69767b47b60cbd -Author: Benda Xu <heroxbd@gentoo.org> -Date: Sat Aug 19 17:31:38 2017 +0900 - - d/s/examples/N/Importing Notebooks.ipynb: disable execution. - - This notebook example includes writing to the directory of another - module, usually resulting in a doc build failure. Therefore we - disable its execution by nbsphinx. - - Closes: #2372 - See-Also: https://bugs.gentoo.org/show_bug.cgi?id=626860 - -diff --git a/docs/source/examples/Notebook/Importing Notebooks.ipynb b/docs/source/examples/Notebook/Importing Notebooks.ipynb -index ee42ad526..d6db5395e 100644 ---- a/docs/source/examples/Notebook/Importing Notebooks.ipynb -+++ b/docs/source/examples/Notebook/Importing Notebooks.ipynb -@@ -511,6 +511,9 @@ - ], - "metadata": { - "gist_id": "6011986", -+ "nbsphinx": { -+ "execute": "never" -+ }, - "kernelspec": { - "display_name": "Python 3", - "language": "python", diff --git a/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch b/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch deleted file mode 100644 index 4dc55d937cae..000000000000 --- a/dev-python/notebook/files/notebook-5.0.0-setupbase.py.patch +++ /dev/null @@ -1,43 +0,0 @@ -Disable bundled mathjax. - -Patch by Marius Brehler ---- a/setupbase.py -+++ b/setupbase.py -@@ -165,37 +165,6 @@ def find_package_data(): - if f.endswith(('.js', '.css')): - static_data.append(pjoin(parent, f)) - -- # Trim mathjax -- mj = lambda *path: pjoin(components, 'MathJax', *path) -- static_data.extend([ -- mj('MathJax.js'), -- mj('config', 'TeX-AMS-MML_HTMLorMML-full.js'), -- mj('config', 'Safe.js'), -- ]) -- -- trees = [] -- mj_out = mj('jax', 'output') -- -- if os.path.exists(mj_out): -- for output in os.listdir(mj_out): -- path = pjoin(mj_out, output) -- static_data.append(pjoin(path, '*.js')) -- autoload = pjoin(path, 'autoload') -- if os.path.isdir(autoload): -- trees.append(autoload) -- -- for tree in trees + [ -- mj('localization'), # limit to en? -- mj('fonts', 'HTML-CSS', 'STIX-Web', 'woff'), -- mj('extensions'), -- mj('jax', 'input', 'TeX'), -- mj('jax', 'output', 'HTML-CSS', 'fonts', 'STIX-Web'), -- mj('jax', 'output', 'SVG', 'fonts', 'STIX-Web'), -- ]: -- for parent, dirs, files in os.walk(tree): -- for f in files: -- static_data.append(pjoin(parent, f)) -- - os.chdir(os.path.join('tests',)) - js_tests = glob('*.js') + glob('*/*.js') - diff --git a/dev-python/pymetar/pymetar-1.1.ebuild b/dev-python/pymetar/pymetar-1.1-r1.ebuild index 2cdf9f0b0c1e..2cdf9f0b0c1e 100644 --- a/dev-python/pymetar/pymetar-1.1.ebuild +++ b/dev-python/pymetar/pymetar-1.1-r1.ebuild diff --git a/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch b/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch deleted file mode 100644 index 2df183f6404f..000000000000 --- a/dev-python/pypiserver/files/pypiserver-1.3.1-no-internet.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/tests/test_app.py b/tests/test_app.py -index 52ce234..46cd23a 100644 ---- a/tests/test_app.py -+++ b/tests/test_app.py -@@ -2,6 +2,7 @@ - - # Builtin imports - import logging -+import unittest - - - try: # python 3 -@@ -177,6 +178,7 @@ def test_favicon(testapp): - testapp.get("/favicon.ico", status=404) - - -+@unittest.skip("Requires internet access") - def test_fallback(root, _app, testapp): - assert _app.config.redirect_to_fallback - resp = testapp.get("/simple/pypiserver/", status=302) -diff --git a/tests/test_manage.py b/tests/test_manage.py -index 9735ac6..bde267d 100755 ---- a/tests/test_manage.py -+++ b/tests/test_manage.py -@@ -118,6 +118,7 @@ def test_pip_cmd_root(pip_ver, cmd_type): - assert tuple(PipCmd.update_root(pip_ver)) == exp_cmd - - -+@pytest.mark.skip(reason="Requires internet access") - def test_pip_cmd_update(): - """Verify the correct determination of a pip command.""" - index = 'https://pypi.org/simple' -@@ -138,6 +139,7 @@ def test_pip_cmd_update(): - ) - - -+@pytest.mark.skip(reason="Requires internet access") - def test_pip_cmd_update_index_overridden(): - """Verify the correct determination of a pip command.""" - index = 'https://pypi.org/complex' -@@ -156,6 +158,7 @@ def test_pip_cmd_update_index_overridden(): - ) - - -+@pytest.mark.skip(reason="Requires internet access") - def test_update_package(monkeypatch): - """Test generating an update command for a package.""" - monkeypatch.setattr(manage, 'call', Mock()) -diff --git a/tests/test_server.py b/tests/test_server.py -index 6cb4bc4..6325b6f 100644 ---- a/tests/test_server.py -+++ b/tests/test_server.py -@@ -275,7 +275,6 @@ def twine_register(packages, repository='test', conf='pypirc', - # Tests - # ###################################################################### - -- - def test_pipInstall_packageNotFound(empty_packdir, port, pipdir, package): - with new_server(empty_packdir, port): - cmd = "centodeps" -@@ -283,18 +282,21 @@ def test_pipInstall_packageNotFound(empty_packdir, port, pipdir, package): - assert not pipdir.listdir() - - -+@pytest.mark.skip(reason="Needs internet") - def test_pipInstall_openOk(open_server, package, pipdir): - cmd = "centodeps" - assert _run_pip_install(cmd, open_server.port, pipdir) == 0 - assert pipdir.join(package.basename).check() - - -+@pytest.mark.skip(reason="Needs internet") - def test_pipInstall_authedFails(protected_server, pipdir): - cmd = "centodeps" - assert _run_pip_install(cmd, protected_server.port, pipdir) != 0 - assert not pipdir.listdir() - - -+@pytest.mark.skip(reason="Needs internet") - def test_pipInstall_authedOk(protected_server, package, pipdir): - cmd = "centodeps" - assert _run_pip_install(cmd, protected_server.port, pipdir, -@@ -395,6 +397,7 @@ def test_twine_upload_open(empty_packdir, port, package): - assert len(empty_packdir.listdir()) == 1 - - -+@pytest.mark.skip(reason="needs internet") - @pytest.mark.parametrize("hash_algo", ("md5", "sha256", "sha512")) - def test_hash_algos(empty_packdir, port, package, pipdir, hash_algo): - """Test twine upload with no authentication""" diff --git a/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch b/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch deleted file mode 100644 index b74df26df5d3..000000000000 --- a/dev-python/pyqtgraph/files/pyqtgraph-0.10.0-qt5.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -r -U2 pyqtgraph-0.10.0.orig/pyqtgraph/Qt.py pyqtgraph-0.10.0/pyqtgraph/Qt.py ---- pyqtgraph-0.10.0.orig/pyqtgraph/Qt.py 2016-10-17 23:22:41.000000000 +0700 -+++ pyqtgraph-0.10.0/pyqtgraph/Qt.py 2018-01-23 22:52:19.503525554 +0700 -@@ -25,5 +25,5 @@ - ## is already imported. If not, then attempt to import PyQt4, then PySide. - if QT_LIB is None: -- libOrder = [PYQT4, PYSIDE, PYQT5] -+ libOrder = [PYQT5] - - for lib in libOrder: diff --git a/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch b/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch deleted file mode 100644 index 4851afe9d1ba..000000000000 --- a/dev-python/pytest-mock/files/pytest-mock-3.1.0-warnings.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1ef3d6111a8e4f32dfa9a2c311b6996afd9e98a5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Tue, 26 May 2020 10:56:27 +0200 -Subject: [PATCH] Permit warnings in *_stale_pyc tests - -The *_stale_pyc test is repeatedly failing on production systems -due to additional pytest plugins being installed and triggering -PytestAssertRewriteWarnings. This causes 'passed *' string not to match -because of the ',' after 'passed'. Match just 'passed*' instead -to solve this. ---- - tests/test_pytest_mock.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py -index 73509a4..5e1a502 100644 ---- a/tests/test_pytest_mock.py -+++ b/tests/test_pytest_mock.py -@@ -809,7 +809,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir): - """ - ) - result = testdir.runpytest() -- result.stdout.fnmatch_lines("* 1 passed *") -+ result.stdout.fnmatch_lines("* 1 passed*") - - kwargs = {"legacy": True} - assert compileall.compile_file(str(py_fn), **kwargs) -@@ -819,7 +819,7 @@ def test_abort_patch_context_manager_with_stale_pyc(testdir): - - py_fn.remove() - result = testdir.runpytest() -- result.stdout.fnmatch_lines("* 1 passed *") -+ result.stdout.fnmatch_lines("* 1 passed*") - - - def test_used_with_class_scope(testdir): --- -2.26.2 - diff --git a/dev-python/pyxattr/files/pyxattr-0.6.0-xattr_header.patch b/dev-python/pyxattr/files/pyxattr-0.6.0-xattr_header.patch deleted file mode 100644 index 89b18730c3d9..000000000000 --- a/dev-python/pyxattr/files/pyxattr-0.6.0-xattr_header.patch +++ /dev/null @@ -1,53 +0,0 @@ -From cc0bc63b291ee1a831f07c81946149dbe8c8146d Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Wed, 10 Jan 2018 11:45:35 +0100 -Subject: [PATCH] xattr.c: There is no more attr/xattr.h with >=attr-2.4.48 - -See also: -http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38 ---- - xattr.c | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/xattr.c b/xattr.c -index 111cec1..c82ee32 100644 ---- a/xattr.c -+++ b/xattr.c -@@ -23,10 +23,8 @@ - - #define PY_SSIZE_T_CLEAN - #include <Python.h> --#if defined(__APPLE__) -+#if defined(__APPLE__) || defined(__linux__) - #include <sys/xattr.h> --#elif defined(__linux__) --#include <attr/xattr.h> - #endif - #include <stdio.h> - -@@ -642,11 +640,7 @@ get_all(PyObject *self, PyObject *args, PyObject *keywds) - /* Now retrieve the attribute value */ - nval = _generic_get(_get_obj, &tgt, s, &buf_val, &nalloc, &io_errno); - if (nval == -1) { -- if ( --#ifdef ENODATA -- io_errno == ENODATA || --#endif -- io_errno == ENOATTR) { -+ if (io_errno == ENODATA) { - PyErr_Clear(); - continue; - } else { -@@ -1173,8 +1167,7 @@ static char __xattr_doc__[] = \ - " a :exc:`EnvironmentError`; under\n" - " Linux, the following ``errno`` values are used:\n" - "\n" -- " - ``ENOATTR`` and ``ENODATA`` mean that the attribute name is\n" -- " invalid\n" -+ " - ``ENODATA`` means that the attribute name is\n invalid\n" - " - ``ENOTSUP`` and ``EOPNOTSUPP`` mean that the filesystem does not\n" - " support extended attributes, or that the namespace is invalid\n" - " - ``E2BIG`` mean that the attribute value is too big\n" --- -2.16.0.rc1 - diff --git a/dev-python/quex/files/quex-0.70.0-gentoo.patch b/dev-python/quex/files/quex-0.70.0-gentoo.patch deleted file mode 100644 index c110c4bdb24d..000000000000 --- a/dev-python/quex/files/quex-0.70.0-gentoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/quex/DEFINITIONS.py 2017-12-13 21:48:52.887765325 +0100 -+++ b/quex/DEFINITIONS.py 2017-12-13 21:52:29.805877359 +0100 -@@ -57,7 +57,7 @@ - global QUEX_INSTALLATION_DIR - - # -- Try to acces the file 'quex-exe.py' in order to verify -- if os.access(QUEX_INSTALLATION_DIR + "/quex-exe.py", os.F_OK) == False: -+ if False: - print "error: Environment variable 'QUEX_PATH' does not point to" - print "error: a valid installation directory of quex." - print "error: current setting of 'QUEX_PATH':" diff --git a/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch b/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch deleted file mode 100644 index ccee6c0281bb..000000000000 --- a/dev-python/rsa/files/rsa-3.4.2-cve-2020-13757.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -Nur rsa-3.4.2.orig/rsa/pkcs1.py rsa-3.4.2/rsa/pkcs1.py ---- rsa-3.4.2.orig/rsa/pkcs1.py 2020-07-05 10:28:57.622204136 +0200 -+++ rsa-3.4.2/rsa/pkcs1.py 2020-07-05 10:30:28.103672033 +0200 -@@ -232,6 +232,12 @@ - decrypted = priv_key.blinded_decrypt(encrypted) - cleartext = transform.int2bytes(decrypted, blocksize) - -+ # Detect leading zeroes in the crypto. These are not reflected in the -+ # encrypted value (as leading zeroes do not influence the value of an -+ # integer). This fixes CVE-2020-13757. -+ if len(crypto) > blocksize: -+ raise DecryptionError('Decryption failed') -+ - # If we can't find the cleartext marker, decryption failed. - if cleartext[0:2] != b('\x00\x02'): - raise DecryptionError('Decryption failed') -@@ -310,6 +316,9 @@ - cleartext = HASH_ASN1[method_name] + message_hash - expected = _pad_for_signing(cleartext, keylength) - -+ if len(signature) != keylength: -+ raise VerificationError('Verification failed') -+ - # Compare with the signed one - if expected != clearsig: - raise VerificationError('Verification failed') -diff -Nur rsa-3.4.2.orig/tests/test_pkcs1.py rsa-3.4.2/tests/test_pkcs1.py ---- rsa-3.4.2.orig/tests/test_pkcs1.py 2020-07-05 10:28:57.621204131 +0200 -+++ rsa-3.4.2/tests/test_pkcs1.py 2020-07-05 10:32:26.858286153 +0200 -@@ -17,6 +17,7 @@ - """Tests string operations.""" - - import struct -+import sys - import unittest - - import rsa -@@ -64,6 +65,35 @@ - - self.assertNotEqual(encrypted1, encrypted2) - -+class ExtraZeroesTest(unittest.TestCase): -+ def setUp(self): -+ # Key, cyphertext, and plaintext taken from https://github.com/sybrenstuvel/python-rsa/issues/146 -+ self.private_key = rsa.PrivateKey.load_pkcs1( -+ "-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAs1EKK81M5kTFtZSuUFnhKy8FS2WNXaWVmi/fGHG4CLw98+Yo\n0nkuUarVwSS0O9pFPcpc3kvPKOe9Tv+6DLS3Qru21aATy2PRqjqJ4CYn71OYtSwM\n/ZfSCKvrjXybzgu+sBmobdtYm+sppbdL+GEHXGd8gdQw8DDCZSR6+dPJFAzLZTCd\nB+Ctwe/RXPF+ewVdfaOGjkZIzDoYDw7n+OHnsYCYozkbTOcWHpjVevipR+IBpGPi\n1rvKgFnlcG6d/tj0hWRl/6cS7RqhjoiNEtxqoJzpXs/Kg8xbCxXbCchkf11STA8u\ndiCjQWuWI8rcDwl69XMmHJjIQAqhKvOOQ8rYTQIDAQABAoIBABpQLQ7qbHtp4h1Y\nORAfcFRW7Q74UvtH/iEHH1TF8zyM6wZsYtcn4y0mxYE3Mp+J0xlTJbeVJkwZXYVH\nL3UH29CWHSlR+TWiazTwrCTRVJDhEoqbcTiRW8fb+o/jljVxMcVDrpyYUHNo2c6w\njBxhmKPtp66hhaDpds1Cwi0A8APZ8Z2W6kya/L/hRBzMgCz7Bon1nYBMak5PQEwV\nF0dF7Wy4vIjvCzO6DSqA415DvJDzUAUucgFudbANNXo4HJwNRnBpymYIh8mHdmNJ\n/MQ0YLSqUWvOB57dh7oWQwe3UsJ37ZUorTugvxh3NJ7Tt5ZqbCQBEECb9ND63gxo\n/a3YR/0CgYEA7BJc834xCi/0YmO5suBinWOQAF7IiRPU+3G9TdhWEkSYquupg9e6\nK9lC5k0iP+t6I69NYF7+6mvXDTmv6Z01o6oV50oXaHeAk74O3UqNCbLe9tybZ/+F\ndkYlwuGSNttMQBzjCiVy0+y0+Wm3rRnFIsAtd0RlZ24aN3bFTWJINIsCgYEAwnQq\nvNmJe9SwtnH5c/yCqPhKv1cF/4jdQZSGI6/p3KYNxlQzkHZ/6uvrU5V27ov6YbX8\nvKlKfO91oJFQxUD6lpTdgAStI3GMiJBJIZNpyZ9EWNSvwUj28H34cySpbZz3s4Xd\nhiJBShgy+fKURvBQwtWmQHZJ3EGrcOI7PcwiyYcCgYEAlql5jSUCY0ALtidzQogW\nJ+B87N+RGHsBuJ/0cxQYinwg+ySAAVbSyF1WZujfbO/5+YBN362A/1dn3lbswCnH\nK/bHF9+fZNqvwprPnceQj5oK1n4g6JSZNsy6GNAhosT+uwQ0misgR8SQE4W25dDG\nkdEYsz+BgCsyrCcu8J5C+tUCgYAFVPQbC4f2ikVyKzvgz0qx4WUDTBqRACq48p6e\n+eLatv7nskVbr7QgN+nS9+Uz80ihR0Ev1yCAvnwmM/XYAskcOea87OPmdeWZlQM8\nVXNwINrZ6LMNBLgorfuTBK1UoRo1pPUHCYdqxbEYI2unak18mikd2WB7Fp3h0YI4\nVpGZnwKBgBxkAYnZv+jGI4MyEKdsQgxvROXXYOJZkWzsKuKxVkVpYP2V4nR2YMOJ\nViJQ8FUEnPq35cMDlUk4SnoqrrHIJNOvcJSCqM+bWHAioAsfByLbUPM8sm3CDdIk\nXVJl32HuKYPJOMIWfc7hIfxLRHnCN+coz2M6tgqMDs0E/OfjuqVZ\n-----END RSA PRIVATE KEY-----", -+ format='PEM') -+ cyphertext = "4501b4d669e01b9ef2dc800aa1b06d49196f5a09fe8fbcd037323c60eaf027bfb98432be4e4a26c567ffec718bcbea977dd26812fa071c33808b4d5ebb742d9879806094b6fbeea63d25ea3141733b60e31c6912106e1b758a7fe0014f075193faa8b4622bfd5d3013f0a32190a95de61a3604711bc62945f95a6522bd4dfed0a994ef185b28c281f7b5e4c8ed41176d12d9fc1b837e6a0111d0132d08a6d6f0580de0c9eed8ed105531799482d1e466c68c23b0c222af7fc12ac279bc4ff57e7b4586d209371b38c4c1035edd418dc5f960441cb21ea2bedbfea86de0d7861e81021b650a1de51002c315f1e7c12debe4dcebf790caaa54a2f26b149cf9e77d" -+ plaintext = "54657374" -+ -+ if sys.version_info < (3, 0): -+ self.cyphertext = cyphertext.decode("hex") -+ self.plaintext = plaintext.decode('hex') -+ else: -+ self.cyphertext = bytes.fromhex(cyphertext) -+ self.plaintext = bytes.fromhex(plaintext) -+ -+ def test_unmodified(self): -+ message = rsa.decrypt(self.cyphertext, self.private_key) -+ self.assertEqual(message, self.plaintext) -+ -+ def test_prepend_zeroes(self): -+ cyphertext = b'\00\00' + self.cyphertext -+ with self.assertRaises(rsa.DecryptionError): -+ rsa.decrypt(cyphertext, self.private_key) -+ -+ def test_append_zeroes(self): -+ cyphertext = self.cyphertext + b'\00\00' -+ with self.assertRaises(rsa.DecryptionError): -+ rsa.decrypt(cyphertext, self.private_key) - - class SignatureTest(unittest.TestCase): - def setUp(self): -@@ -105,3 +135,21 @@ - signature2 = pkcs1.sign(message, self.priv, 'SHA-1') - - self.assertEqual(signature1, signature2) -+ -+ def test_prepend_zeroes(self): -+ """Prepending the signature with zeroes should be detected.""" -+ -+ message = b'je moeder' -+ signature = pkcs1.sign(message, self.priv, 'SHA-256') -+ signature = b'\00\00' + signature -+ with self.assertRaises(rsa.VerificationError): -+ pkcs1.verify(message, signature, self.pub) -+ -+ def test_apppend_zeroes(self): -+ """Apppending the signature with zeroes should be detected.""" -+ -+ message = b'je moeder' -+ signature = pkcs1.sign(message, self.priv, 'SHA-256') -+ signature = signature + b'\00\00' -+ with self.assertRaises(rsa.VerificationError): -+ pkcs1.verify(message, signature, self.pub) diff --git a/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch b/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch deleted file mode 100644 index f6f78af192dd..000000000000 --- a/dev-python/tox/files/tox-3.9.0-strip-setuptools_scm.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/setup.py b/setup.py -index 73f2540..8d6f3c3 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,19 +1,13 @@ - # -*- coding: utf-8 -*- --import textwrap -+import os - - from setuptools import setup - --setup( -- use_scm_version={ -- "write_to": "src/tox/version.py", -- "write_to_template": textwrap.dedent( -- """ -- # coding: utf-8 -- from __future__ import unicode_literals -+VERSION = os.environ['PV'] -+with open('src/tox/version.py', 'wt') as fp: -+ fp.write("__version__ = u'{}'".format(VERSION)) - -- __version__ = {version!r} -- """ -- ).lstrip(), -- }, -+setup( -+ version=VERSION, - package_dir={"": "src"}, - ) diff --git a/dev-python/twine/files/twine-3.0.0-tests.patch b/dev-python/twine/files/twine-3.0.0-tests.patch deleted file mode 100644 index e79fa03646d2..000000000000 --- a/dev-python/twine/files/twine-3.0.0-tests.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tests/test_upload.py b/tests/test_upload.py -index c87e16e..1487a0d 100644 ---- a/tests/test_upload.py -+++ b/tests/test_upload.py -@@ -13,6 +13,7 @@ - # limitations under the License. - import pretend - import pytest -+import unittest - from requests.exceptions import HTTPError - - from twine.commands import upload -@@ -298,6 +299,7 @@ def test_values_from_env(monkeypatch): - "https://test.pypi.org/", - "https://pypi.org/" - ]) -+@unittest.skip("needs internet access") - def test_check_status_code_for_wrong_repo_url(repo_url, make_settings): - upload_settings = make_settings() - diff --git a/dev-python/xcffib/files/xcffib-0.10.0-testing.patch b/dev-python/xcffib/files/xcffib-0.10.0-testing.patch deleted file mode 100644 index 7c075ae9811c..000000000000 --- a/dev-python/xcffib/files/xcffib-0.10.0-testing.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/xcffib/testing.py b/xcffib/testing.py -index ef0268a..0662fcf 100644 ---- a/xcffib/testing.py -+++ b/xcffib/testing.py -@@ -31,11 +31,14 @@ def lock_path(display): - def find_display(): - display = 10 - while True: -- f = open(lock_path(display), "w+") - try: -- fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB) -- except OSError: -- f.close() -+ f = open(lock_path(display), "w+") -+ try: -+ fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB) -+ except: -+ f.close() -+ raise -+ except OSError: - display += 1 - continue - return display, f diff --git a/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch b/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch deleted file mode 100644 index 737135b0ff00..000000000000 --- a/dev-python/yarl/files/yarl-1.5.0-typing_ext.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 47478e942992aaaa26c2defc3294cac45ede2cfe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 27 Jul 2020 07:13:19 +0200 -Subject: [PATCH] Require typing_extensions for py<3.8 only - -All the names imported from typing_extensions are available already -in Python 3.8, so there is no need to use the additional dependency -there. Furthermore, typing_extensions currently do not support -Python 3.9, effectively blocking yarl from doing so. To solve this, -use external typing_extensions only for py<3.8, and just use builtin -typing in 3.8+. ---- - requirements/test.txt | 2 +- - setup.py | 3 ++- - yarl/__init__.pyi | 7 ++++++- - 3 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 41d684d..1ed5bfe 100644 ---- a/setup.py -+++ b/setup.py -@@ -30,7 +30,8 @@ with fname.open(encoding="utf8") as fp: - except IndexError: - raise RuntimeError("Unable to determine version.") - --install_requires = ["multidict>=4.0", "idna>=2.0", "typing_extensions>=3.7.4"] -+install_requires = ["multidict>=4.0", "idna>=2.0", -+ "typing_extensions>=3.7.4;python_version<\"3.8\""] - - - def read(name): -diff --git a/yarl/__init__.pyi b/yarl/__init__.pyi -index b3b58ec..eb4a12f 100644 ---- a/yarl/__init__.pyi -+++ b/yarl/__init__.pyi -@@ -1,7 +1,12 @@ - from typing import overload, Any, Tuple, Optional, Mapping, Union, Sequence, Type --from typing_extensions import TypedDict, Final, final - import multidict - from functools import _CacheInfo -+import sys -+ -+if sys.hexversion >= 0x03080000: -+ from typing import TypedDict, Final, final -+else: -+ from typing_extensions import TypedDict, Final, final - - _QueryVariable = Union[str, int] - _Query = Union[ --- -2.27.0 - diff --git a/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch b/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch deleted file mode 100644 index fdaa4aa03922..000000000000 --- a/dev-python/zstandard/files/zstandard-0.13.0-compiler.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/make_cffi.py b/make_cffi.py -index 0db4f71..4fe9cc4 100644 ---- a/make_cffi.py -+++ b/make_cffi.py -@@ -8,6 +8,7 @@ from __future__ import absolute_import - - import cffi - import distutils.ccompiler -+import distutils.sysconfig - import os - import re - import subprocess -@@ -75,10 +76,12 @@ compiler = distutils.ccompiler.new_compiler() - if hasattr(compiler, "initialize"): - compiler.initialize() - -+distutils.sysconfig.customize_compiler(compiler) -+ - # Distutils doesn't set compiler.preprocessor, so invoke the preprocessor - # manually. - if compiler.compiler_type == "unix": -- args = list(compiler.executables["compiler"]) -+ args = compiler.compiler - args.extend( - ["-E", "-DZSTD_STATIC_LINKING_ONLY", "-DZDICT_STATIC_LINKING_ONLY",] - ) |
