From d101a9eb41ef28068d8124b2415486551090b610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Deckert?= Date: Fri, 12 Aug 2022 18:34:13 +0200 Subject: [PATCH] update privacyIDEA + dependencies --- acct-group/privacyidea/Manifest | 2 + acct-group/privacyidea/metadata.xml | 5 + acct-group/privacyidea/privacyidea-0.ebuild | 10 + acct-user/privacyidea/Manifest | 2 + acct-user/privacyidea/metadata.xml | 5 + acct-user/privacyidea/privacyidea-0.ebuild | 12 ++ dev-python/click/Manifest | 2 + dev-python/click/click-7.1.2-r1.ebuild | 27 +++ dev-python/flask-migrate/Manifest | 4 + .../flask-migrate/flask-migrate-2.6.0.ebuild | 32 +++ .../flask-migrate/flask-migrate-2.7.0.ebuild | 32 +++ dev-python/flask-versioned/Manifest | 2 +- .../flask-versioned-0.9.4.ebuild | 6 +- dev-python/flask/Manifest | 2 + dev-python/flask/flask-1.1.4.ebuild | 50 +++++ dev-python/huey/Manifest | 8 +- dev-python/huey/huey-1.11.0.ebuild | 4 +- dev-python/huey/huey-2.3.0.ebuild | 2 +- dev-python/huey/huey-2.4.0.ebuild | 22 ++ dev-python/huey/huey-2.4.3.ebuild | 23 +++ dev-python/itsdangerous/Manifest | 2 + .../itsdangerous/itsdangerous-1.1.0-r1.ebuild | 22 ++ dev-python/jinja/Manifest | 2 + dev-python/jinja/jinja-2.11.3.ebuild | 67 +++++++ dev-python/markupsafe/Manifest | 2 + dev-python/markupsafe/markupsafe-2.0.1.ebuild | 22 ++ dev-python/namespace-flaskext/Manifest | 2 +- .../namespace-flaskext-1.ebuild | 4 +- dev-python/pydash/Manifest | 2 + dev-python/pydash/pydash-5.1.0.ebuild | 28 +++ dev-python/pyrad/Manifest | 6 +- dev-python/pyrad/pyrad-2.1.ebuild | 4 +- dev-python/pyrad/pyrad-2.3.ebuild | 2 +- dev-python/pyrad/pyrad-2.4.ebuild | 22 ++ dev-python/python-yubico/Manifest | 2 +- .../python-yubico/python-yubico-1.3.3.ebuild | 5 +- dev-python/smpplib/Manifest | 4 +- dev-python/smpplib/smpplib-2.0.1.ebuild | 2 +- dev-python/smpplib/smpplib-2.1.0.ebuild | 5 +- dev-python/sqlalchemy/Manifest | 3 + .../files/sqlalchemy-1.3.20-pypy3.patch | 188 ++++++++++++++++++ .../sqlalchemy/sqlalchemy-1.3.24.ebuild | 62 ++++++ dev-python/sqlsoup/Manifest | 2 +- dev-python/sqlsoup/sqlsoup-0.9.1.ebuild | 9 +- dev-python/werkzeug/Manifest | 2 + dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild | 50 +++++ www-apps/privacyidea/Manifest | 11 +- www-apps/privacyidea/files/logging.yaml | 34 ++++ ...ea-3.4.ebuild => privacyidea-3.6.2.ebuild} | 24 +-- ...-3.2.2.ebuild => privacyidea-3.7.3.ebuild} | 52 +++-- www-apps/privacyideaadm/Manifest | 4 +- .../privacyideaadm-2.23.5.ebuild | 2 +- .../privacyideaadm/privacyideaadm-3.0.ebuild | 5 +- 53 files changed, 836 insertions(+), 69 deletions(-) create mode 100644 acct-group/privacyidea/Manifest create mode 100644 acct-group/privacyidea/metadata.xml create mode 100644 acct-group/privacyidea/privacyidea-0.ebuild create mode 100644 acct-user/privacyidea/Manifest create mode 100644 acct-user/privacyidea/metadata.xml create mode 100644 acct-user/privacyidea/privacyidea-0.ebuild create mode 100644 dev-python/click/Manifest create mode 100644 dev-python/click/click-7.1.2-r1.ebuild create mode 100644 dev-python/flask-migrate/Manifest create mode 100644 dev-python/flask-migrate/flask-migrate-2.6.0.ebuild create mode 100644 dev-python/flask-migrate/flask-migrate-2.7.0.ebuild create mode 100644 dev-python/flask/Manifest create mode 100644 dev-python/flask/flask-1.1.4.ebuild create mode 100644 dev-python/huey/huey-2.4.0.ebuild create mode 100644 dev-python/huey/huey-2.4.3.ebuild create mode 100644 dev-python/itsdangerous/Manifest create mode 100644 dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild create mode 100644 dev-python/jinja/Manifest create mode 100644 dev-python/jinja/jinja-2.11.3.ebuild create mode 100644 dev-python/markupsafe/Manifest create mode 100644 dev-python/markupsafe/markupsafe-2.0.1.ebuild create mode 100644 dev-python/pydash/Manifest create mode 100644 dev-python/pydash/pydash-5.1.0.ebuild create mode 100644 dev-python/pyrad/pyrad-2.4.ebuild create mode 100644 dev-python/sqlalchemy/Manifest create mode 100644 dev-python/sqlalchemy/files/sqlalchemy-1.3.20-pypy3.patch create mode 100644 dev-python/sqlalchemy/sqlalchemy-1.3.24.ebuild create mode 100644 dev-python/werkzeug/Manifest create mode 100644 dev-python/werkzeug/werkzeug-1.0.1-r1.ebuild create mode 100644 www-apps/privacyidea/files/logging.yaml rename www-apps/privacyidea/{privacyidea-3.4.ebuild => privacyidea-3.6.2.ebuild} (90%) rename www-apps/privacyidea/{privacyidea-3.2.2.ebuild => privacyidea-3.7.3.ebuild} (71%) diff --git a/acct-group/privacyidea/Manifest b/acct-group/privacyidea/Manifest new file mode 100644 index 0000000..9255eee --- /dev/null +++ b/acct-group/privacyidea/Manifest @@ -0,0 +1,2 @@ +EBUILD privacyidea-0.ebuild 200 BLAKE2B 1ce13a3a27ae58cbb366904dd7ea183075b127153fe37f447f86d9e3fd5d83ca4dec4a84c2026a909fc30b5cbbc7e25511374047f55e3d4916a42ed0252151df SHA512 01ecc188ef06a84ed841a53de91d12287c90eba815ca0367fe685e8b20d0b11dcd72a22050b58f7b1fdb61d9fbea959f8a0a2b5d62dcbf0d863e623f72ec3940 +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/acct-group/privacyidea/metadata.xml b/acct-group/privacyidea/metadata.xml new file mode 100644 index 0000000..115e9d6 --- /dev/null +++ b/acct-group/privacyidea/metadata.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/acct-group/privacyidea/privacyidea-0.ebuild b/acct-group/privacyidea/privacyidea-0.ebuild new file mode 100644 index 0000000..72e921f --- /dev/null +++ b/acct-group/privacyidea/privacyidea-0.ebuild @@ -0,0 +1,10 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit acct-group + +DESCRIPTION="A group for www-apps/privcyidea" + +ACCT_GROUP_ID="605" diff --git a/acct-user/privacyidea/Manifest b/acct-user/privacyidea/Manifest new file mode 100644 index 0000000..115046f --- /dev/null +++ b/acct-user/privacyidea/Manifest @@ -0,0 +1,2 @@ +EBUILD privacyidea-0.ebuild 249 BLAKE2B 51ab25e79d7e3e89e06b24ef1deab7029b7f47d53e8e140f5e570d295fd38b4b688a775d94b29710ac3edbb8fa7e71b3e6ab779fe72a03a8ecf4caefe4c3a214 SHA512 e5d9fc055a544a005db08aabc54ee0905d8197cfc9ba2e7f9c08e23e039c63b9b4d250cc659db1a48e65983619b398fcba0db57cb5b55e73d1c23e1054e7cee2 +MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/acct-user/privacyidea/metadata.xml b/acct-user/privacyidea/metadata.xml new file mode 100644 index 0000000..115e9d6 --- /dev/null +++ b/acct-user/privacyidea/metadata.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/acct-user/privacyidea/privacyidea-0.ebuild b/acct-user/privacyidea/privacyidea-0.ebuild new file mode 100644 index 0000000..002cf56 --- /dev/null +++ b/acct-user/privacyidea/privacyidea-0.ebuild @@ -0,0 +1,12 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit acct-user + +ACCT_USER_ID="605" +ACCT_USER_GROUPS=( "privacyidea" ) +ACCT_USER_HOME="/var/lib/privacyidea/home" + +acct-user_add_deps diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest new file mode 100644 index 0000000..397daed --- /dev/null +++ b/dev-python/click/Manifest @@ -0,0 +1,2 @@ +DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba +EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B d1d38b50a150be24f89380cf98233f141ca96c91e6dbc64153c8cfd6326b98098a174fb7ee58fb120957509b85262a056d7837a9e9f61639abb10d6707f6845a SHA512 ac8ba661a0f1664960eaf8748cfa1118e851ee5b2a4cd924b37742d6d09009dc7e4eaef10b08f1d796d47cdce0ba3483fc2809eefe0717111339327b14585c22 diff --git a/dev-python/click/click-7.1.2-r1.ebuild b/dev-python/click/click-7.1.2-r1.ebuild new file mode 100644 index 0000000..edce255 --- /dev/null +++ b/dev-python/click/click-7.1.2-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..10} pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="A Python package for creating beautiful command line interfaces" +SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +IUSE="examples" + +distutils_enable_sphinx docs \ + '>=dev-python/docutils-0.14' \ + dev-python/pallets-sphinx-themes +distutils_enable_tests pytest + +python_install_all() { + use examples && dodoc -r examples + distutils-r1_python_install_all +} diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest new file mode 100644 index 0000000..d26db84 --- /dev/null +++ b/dev-python/flask-migrate/Manifest @@ -0,0 +1,4 @@ +DIST Flask-Migrate-2.6.0.tar.gz 12671 BLAKE2B d8d1ab6fc7c077cc9c6dfe5de26c7ab0f2bcb45455f28fdb1bc03b6ac23a063f5c4103d57050a3e0818debd59cd9927ed4833d1cd924a2147ae16f766c045d82 SHA512 91ce86079b8f438357e5bffa809dd737c26ca5cb553ac9bd315ce5039112842e2a52fbf3cec3f6548eb13def8d641be2a4e12dcbe01995b1ab073af989dbbb68 +DIST Flask-Migrate-2.7.0.tar.gz 12627 BLAKE2B 2ad252ef6338bd45c2df4cf95ebaa137e43b5cce7780ccafcc9a0d972473ab230acae03ca14c1dd1f500ceb4c5fa1d0ed6a892bf7e2317c9dfd530a59c025da3 SHA512 9d5f5845c3483bc2ab1271431312331bbc45aeac5bd9464f99898e16e32d9ba124cb11f11fae59a29bf1d6e3dba5f2ca922ae32c2548a5d67d9286ca17d475ab +EBUILD flask-migrate-2.6.0.ebuild 768 BLAKE2B 40f6e764c9da95a698ecf939219c3d26d811caeb08421e3423a75e0f603aa613244ca3db06ea39b3e46d2ebbd4653bacaa30b82877de4b614b1ff5adbed10f2a SHA512 87adf4597b2a48653a04236a13df3dc48df7520d876fc5f2ecf9febce6e2443f7f4c0e6f8dec1ef1f5572b4d24e0ecee3edf50201c72e9250e24127b9cabe7c1 +EBUILD flask-migrate-2.7.0.ebuild 770 BLAKE2B 4fa4e3a5657edaebb9ecf2a602473837fca4f48e0c0a759c360c7c27e2262cdd2348e7facf6f6931edbbcde01d62591b248bab7ea75ec4ca9f89463def757322 SHA512 82e3f60dcae9b15e1bf8994ff66cb4363d259cffaa9ea1d5478a05621ef97a76196fe191d68788504feedc29cbaf1e2f4f31c0dd29f07237b57b6c663dde3ed1 diff --git a/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild new file mode 100644 index 0000000..b32f840 --- /dev/null +++ b/dev-python/flask-migrate/flask-migrate-2.6.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..11} ) +inherit distutils-r1 + +MY_PN="Flask-Migrate" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic" +HOMEPAGE="https://pypi.org/project/Flask-Migrate/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/alembic-0.7[${PYTHON_USEDEP}] + >=dev-python/flask-0.9[${PYTHON_USEDEP}] + >=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] ) +" + +distutils_enable_tests setup.py diff --git a/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild b/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild new file mode 100644 index 0000000..34e5844 --- /dev/null +++ b/dev-python/flask-migrate/flask-migrate-2.7.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..11} ) +inherit distutils-r1 + +MY_PN="Flask-Migrate" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic" +HOMEPAGE="https://pypi.org/project/Flask-Migrate/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/alembic-0.7[${PYTHON_USEDEP}] + >=dev-python/flask-0.9[${PYTHON_USEDEP}] + >=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( >=dev-python/flask-script-0.6[${PYTHON_USEDEP}] ) +" + +distutils_enable_tests setup.py diff --git a/dev-python/flask-versioned/Manifest b/dev-python/flask-versioned/Manifest index f7e02ce..543528e 100644 --- a/dev-python/flask-versioned/Manifest +++ b/dev-python/flask-versioned/Manifest @@ -1,2 +1,2 @@ DIST Flask-Versioned-0.9.4-20101221.tar.gz 2273 BLAKE2B 67f527fed308cf4514b8ea517d73e4b70d3e14551a90da3eee8da3e8e151af0cb69cb15435f3c45ad35f376c2f0baea44f789573c7d28edb17e115aa547517fc SHA512 465ea74e0b50e709e689adb4fbe413308f51aa1c3f5df33706030cfd9cd118e021e5ca3dbb419c5dcd3bfb39333e70cbece94dd910c873e507b7155500a01aa5 -EBUILD flask-versioned-0.9.4.ebuild 854 BLAKE2B f7e6924aecd0a6646c602fd049cad84d9090ff5b0471ca16ccbc5a5ec7e59cfc8889d4c73644e9003dc39e2b1454f52b0f5f114920b63879b30fe9cd8010ff06 SHA512 19b06620b516870303755cda3224d54365bb869d9d02289ba4515cabb987290ef5700b845c1ef92d28aebae14f9e6fda585651e367a4072eb884097c08527d10 +EBUILD flask-versioned-0.9.4.ebuild 887 BLAKE2B 279e9a8c4497f0932e1228d2692deae15a2826bcb65487a46efd12c8567e75066fbcf71a3c0aa4833afd928f6a615dbd1a7ba0aad702d85e8a0dded09b7e6c67 SHA512 70364b1747a09f3f06e2f2574c36d0991e215eb9f73b294ffd95ac631c27aca4d5b90e49d24da4a66387d830dcf99ead835d9a745bfc4b3b4bddfd3682e8a449 diff --git a/dev-python/flask-versioned/flask-versioned-0.9.4.ebuild b/dev-python/flask-versioned/flask-versioned-0.9.4.ebuild index af70fee..ac1a107 100644 --- a/dev-python/flask-versioned/flask-versioned-0.9.4.ebuild +++ b/dev-python/flask-versioned/flask-versioned-0.9.4.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) -PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 MY_PN="Flask-Versioned" diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest new file mode 100644 index 0000000..b4035b7 --- /dev/null +++ b/dev-python/flask/Manifest @@ -0,0 +1,2 @@ +DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d +EBUILD flask-1.1.4.ebuild 1331 BLAKE2B fb28733820d76464498d0bb61e42951342356c6956a2df5f426ca5559750c67f56f3d04b2b371517be6c0aa11027191d7fad8f165382af5b44f665f6bca7f120 SHA512 f8bde0e7632f9e04c550cf6b6bb0eb1c7c8aa990483ed18774b244eec3bab919c5112a6da6344cb03c8381689cb6452298adc7ffe5c4ed1b93f85e5f38eb6216 diff --git a/dev-python/flask/flask-1.1.4.ebuild b/dev-python/flask/flask-1.1.4.ebuild new file mode 100644 index 0000000..bbfd892 --- /dev/null +++ b/dev-python/flask/flask-1.1.4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..11} pypy3 ) +inherit distutils-r1 + +DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions" +HOMEPAGE="https://github.com/pallets/flask/" +MY_PN="Flask" +MY_P="${MY_PN}-${PV}" +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git" + inherit git-r3 +else + SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + S="${WORKDIR}/${MY_P}" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="examples test" +RESTRICT="!test? ( test )" + +RDEPEND=" +Date: Sat Apr 18 18:10:59 2020 +0200 + + Enable pypy tests on github workflow + + Fixes: #5223 + Change-Id: I0952e54ed9af2952ea340be1945311376ffc1ad2 + +diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py +index 6f3170a9e..0427eeac5 100644 +--- a/lib/sqlalchemy/orm/mapper.py ++++ b/lib/sqlalchemy/orm/mapper.py +@@ -1326,7 +1326,7 @@ class Mapper(InspectionAttr): + if key == "__init__" and hasattr(method, "_sa_original_init"): + method = method._sa_original_init + if isinstance(method, types.MethodType): +- method = method.im_func ++ method = method.__func__ + if isinstance(method, types.FunctionType): + if hasattr(method, "__sa_reconstructor__"): + self._reconstructor = method +diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py +index ad4ebb656..dc47f671e 100644 +--- a/lib/sqlalchemy/testing/plugin/pytestplugin.py ++++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py +@@ -340,7 +340,7 @@ def %(name)s(%(args)s): + code, {"target": target, "fn": fn}, fn.__name__ + ) + if not add_positional_parameters: +- decorated.__defaults__ = getattr(fn, "im_func", fn).__defaults__ ++ decorated.__defaults__ = getattr(fn, "__func__", fn).__defaults__ + decorated.__wrapped__ = fn + return update_wrapper(decorated, fn) + else: +diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py +index 7de16bcdf..e256d7764 100644 +--- a/lib/sqlalchemy/util/langhelpers.py ++++ b/lib/sqlalchemy/util/langhelpers.py +@@ -151,7 +151,7 @@ def %(name)s(%(args)s): + decorated = _exec_code_in_env( + code, {targ_name: target, fn_name: fn}, fn.__name__ + ) +- decorated.__defaults__ = getattr(fn, "im_func", fn).__defaults__ ++ decorated.__defaults__ = getattr(fn, "__func__", fn).__defaults__ + decorated.__wrapped__ = fn + return update_wrapper(decorated, fn) + +@@ -751,7 +751,7 @@ def monkeypatch_proxied_specials( + fn = getattr(from_cls, method) + if not hasattr(fn, "__call__"): + continue +- fn = getattr(fn, "im_func", fn) ++ fn = getattr(fn, "__func__", fn) + except AttributeError: + continue + try: +diff --git a/test/base/test_utils.py b/test/base/test_utils.py +index 8356de61b..c04dea7cd 100644 +--- a/test/base/test_utils.py ++++ b/test/base/test_utils.py +@@ -411,7 +411,8 @@ class WrapCallableTest(fixtures.TestBase): + lambda: my_functools_default(), my_functools_default + ) + eq_(c.__name__, "partial") +- eq_(c.__doc__, my_functools_default.__call__.__doc__) ++ if not compat.pypy: # pypy fails this check ++ eq_(c.__doc__, my_functools_default.__call__.__doc__) + eq_(c(), 5) + + +diff --git a/test/engine/test_logging.py b/test/engine/test_logging.py +index fe4ff44a7..e14c3a37d 100644 +--- a/test/engine/test_logging.py ++++ b/test/engine/test_logging.py +@@ -8,6 +8,7 @@ from sqlalchemy import or_ + from sqlalchemy import select + from sqlalchemy import String + from sqlalchemy import Table ++from sqlalchemy import testing + from sqlalchemy import util + from sqlalchemy.sql import util as sql_util + from sqlalchemy.testing import assert_raises_message +@@ -460,10 +461,12 @@ class PoolLoggingTest(fixtures.TestBase): + q = self._stpool_logging_fixture() + self._test_queuepool(q, False) + ++ @testing.requires.predictable_gc + def test_queuepool_echo(self): + q = self._queuepool_echo_fixture() + self._test_queuepool(q) + ++ @testing.requires.predictable_gc + def test_queuepool_logging(self): + q = self._queuepool_logging_fixture() + self._test_queuepool(q) +diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py +index 3b989959e..c8cd89555 100644 +--- a/test/engine/test_pool.py ++++ b/test/engine/test_pool.py +@@ -608,6 +608,7 @@ class PoolEventsTest(PoolTestBase): + assert canary.call_args_list[0][0][0] is dbapi_con + assert canary.call_args_list[0][0][2] is exc + ++ @testing.requires.predictable_gc + def test_checkin_event_gc(self): + p, canary = self._checkin_event_fixture() + +diff --git a/test/orm/test_deferred.py b/test/orm/test_deferred.py +index f8817bbd7..2bf466c15 100644 +--- a/test/orm/test_deferred.py ++++ b/test/orm/test_deferred.py +@@ -1700,6 +1700,8 @@ class WithExpressionTest(fixtures.DeclarativeMappedTest): + c1 = s.query(C).order_by(C.id) + eq_(c1.all(), [C(c_expr=1), C(c_expr=1)]) + ++ s.expunge_all() ++ + c2 = ( + s.query(C) + .options(with_expression(C.c_expr, C.x * 2)) + +commit 8d3ac81a8794bdd3532ad07427edf9f48493919d +Date: Wed Oct 14 18:25:45 2020 +0200 + + Skip a failing test that got removed in master + + https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0 + +diff --git a/test/orm/test_deprecations.py b/test/orm/test_deprecations.py +index 156898f..0d6dc72 100644 +--- a/test/orm/test_deprecations.py ++++ b/test/orm/test_deprecations.py +@@ -560,7 +560,7 @@ class StrongIdentityMapTest(_fixtures.FixtureTest): + def test_prune_imap(self): + self._test_prune(self._strong_ident_fixture) + +- def test_prune_events(self): ++ def _test_prune_events(self): + self._test_prune(self._event_fixture) + + @testing.fails_if(lambda: pypy, "pypy has a real GC") + +commit 1a1cc0e623698a75274f1525d2d14464ff738b86 +Date: Wed Oct 14 18:28:56 2020 +0200 + + Fix PyPy-related tests + + Partial backport of https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45 + +diff --git a/test/base/test_utils.py b/test/base/test_utils.py +diff --git a/test/base/test_utils.py b/test/base/test_utils.py +index 8356de61b..c3d25b824 100644 +--- a/test/base/test_utils.py ++++ b/test/base/test_utils.py +@@ -1725,7 +1725,7 @@ class ArgInspectionTest(fixtures.TestBase): + + assert_raises(TypeError, get_callable_argspec, datetime.datetime.now) + +- @fails_if(lambda: util.pypy, "pypy returns plain *arg, **kw") ++ @testing.requires.cpython + def test_callable_argspec_obj_init(self): + assert_raises(TypeError, get_callable_argspec, object) + +@@ -2154,10 +2154,7 @@ class TestFormatArgspec(_Py3KFixtures, fixtures.TestBase): + grouped=False, + ) + +- @testing.fails_if( +- lambda: util.pypy, +- "pypy doesn't report Obj.__init__ as object.__init__", +- ) ++ @testing.requires.cpython + def test_init_grouped(self): + object_spec = { + "args": "(self)", +@@ -2181,10 +2178,7 @@ class TestFormatArgspec(_Py3KFixtures, fixtures.TestBase): + self._test_init(None, object_spec, wrapper_spec, custom_spec) + self._test_init(True, object_spec, wrapper_spec, custom_spec) + +- @testing.fails_if( +- lambda: util.pypy, +- "pypy doesn't report Obj.__init__ as object.__init__", +- ) ++ @testing.requires.cpython + def test_init_bare(self): + object_spec = { + "args": "self", diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.24.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.24.ebuild new file mode 100644 index 0000000..4ab9645 --- /dev/null +++ b/dev-python/sqlalchemy/sqlalchemy-1.3.24.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( pypy3 python3_{7..11} ) +PYTHON_REQ_USE="sqlite?" + +inherit distutils-r1 multiprocessing optfeature + +MY_PN="SQLAlchemy" +MY_P="${MY_PN}-${PV/_beta/b}" + +DESCRIPTION="Python SQL toolkit and Object Relational Mapper" +HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/" +SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="examples +sqlite test" + +# Use pytest-xdist to speed up tests +BDEPEND=" + test? ( + $(python_gen_impl_dep sqlite) + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + # Ported part of those commits to fix failing tests: + # https://github.com/sqlalchemy/sqlalchemy/commit/c68f9fb87868c45fcadcc942ce4a35f10ff2f7ea + # https://github.com/sqlalchemy/sqlalchemy/commit/a9b068ae564e5e775e312373088545b75aeaa1b0 + # https://github.com/sqlalchemy/sqlalchemy/commit/9e31fc74089cf565df5f275d22eb8ae5414d6e45 + "${FILESDIR}/sqlalchemy-1.3.20-pypy3.patch" +) + +distutils_enable_tests pytest + +python_test() { + # Disable tests hardcoding function call counts specific to Python versions. + epytest --ignore test/aaa_profiling \ + -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" +} + +python_install_all() { + if use examples; then + docompress -x "/usr/share/doc/${PF}/examples" + dodoc -r examples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \ + dev-python/mysql-connector-python + optfeature "mssql support" dev-python/pymssql + optfeature "postgresql support" dev-python/psycopg:2 +} diff --git a/dev-python/sqlsoup/Manifest b/dev-python/sqlsoup/Manifest index 53ce855..5926dd3 100644 --- a/dev-python/sqlsoup/Manifest +++ b/dev-python/sqlsoup/Manifest @@ -1,2 +1,2 @@ DIST sqlsoup-0.9.1.tar.gz 20622 BLAKE2B 4356f935192423ea196e6d29e4e1d520667fe4a55add7b91d7930e19d6470c97e296e6373ae4dc539ca5487c75360592073b91d714acfb54439c2e155d862d4c SHA512 a6fee93bf7be24545c785ab995e345374ae947714c5233ede6aaf7a263e75f88987c8a875903891f35088eebdba789467ada3bcfc030cc77a65afc63aae069d7 -EBUILD sqlsoup-0.9.1.ebuild 517 BLAKE2B e67395d0a097996874a509990811a6d25f2cbef71c78a9bfb1dc3ed902eae4344ecc9b985ab5bef8ce25f252c06f791c86b079019ff3ca740567a117477a792e SHA512 c46e94211b588358525976c39f8b01819f1f3621ebd7e0491022564e1a304a13c2b27f279914d4287bb987c247f54ef6eb411c331c655473f095f7eb8b255483 +EBUILD sqlsoup-0.9.1.ebuild 592 BLAKE2B 73714de0cb388cb21baf2f18c2b58e760fbf1820ab5e5312a7115192e0a47bb32b554fd64691e84f791291c196145f2465d9a175bdb867344dd3c5fec5fd3106 SHA512 052e674d668851209a6b4b301bd208d06b3ee884306bbff72ba75523e41791ffda4aca51d1eaf1f70679c7e182d1b6fa1cd3fa261f4bc681cca0b525f16d4a0b diff --git a/dev-python/sqlsoup/sqlsoup-0.9.1.ebuild b/dev-python/sqlsoup/sqlsoup-0.9.1.ebuild index 7ce2bbf..5fccf99 100644 --- a/dev-python/sqlsoup/sqlsoup-0.9.1.ebuild +++ b/dev-python/sqlsoup/sqlsoup-0.9.1.ebuild @@ -2,9 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=5 +EAPI=8 -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) inherit distutils-r1 @@ -17,5 +18,7 @@ SLOT="0" LICENSE="LGPL-2" KEYWORDS="x86 amd64" -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + > /$D/etc/privacyidea/pi.cfg doins deploy/privacyidea/NetKnights.pem doins deploy/privacyidea/enckey doins deploy/privacyidea/private.pem @@ -109,16 +127,10 @@ python_install_all() { insinto /usr/share/privacyidea/freeradius doins ../FreeRADIUS-${VRADIUS}/privacyidea_radius.pm -## insinto /etc/privacyidea/CA -## doins deploy/debian/openssl.cnf - fowners -R ${PN}:root /etc/privacyidea fperms 600 /etc/privacyidea/enckey \ /etc/privacyidea/private.pem -## insinto /etc/logrotate.d -## newins "${FILESDIR}/${PN}.logrotate" ${PN} - diropts -o privacyidea -g root keepdir /var/log/privacyidea diff --git a/www-apps/privacyideaadm/Manifest b/www-apps/privacyideaadm/Manifest index f2eb0c7..6a48b0c 100644 --- a/www-apps/privacyideaadm/Manifest +++ b/www-apps/privacyideaadm/Manifest @@ -1,4 +1,4 @@ DIST privacyideaadm-2.23.5.tar.gz 59034 BLAKE2B b23b297e9d182760cf1e977f42b16b528cb2eff29b72687250b78fa69d266275dd82ebd1e0d8eddb499ecf9693976f5ba9aeabbac1d9b7049144bfac869a9003 SHA512 cbad4380335cb1f9c572cec4c9f9764bdbdcb6e5b537aaff5732e4fa49ed41e8f65ec1e6b67cbf514e7a0f41737fcf6170cf272723d645c4cf9f4cd3c4b5ce6e DIST privacyideaadm-3.0.tar.gz 62895 BLAKE2B edf74ff8f2892aaeab8fa6b6c2c0a2b6ca79f19b2b33b712b30c5a452b658ed581ea322d29ac933ea5f160e0d50646203e9adc9c806200ad3130d5f668399854 SHA512 fad29d008cd87e6806a04ceeae42663c544d68c358361c3e9ae1e61abf249792809d4eb2f4cf0030f29681b44ad1336a772aa81e924a409bcb58bbafb0e54f30 -EBUILD privacyideaadm-2.23.5.ebuild 1006 BLAKE2B 606034b8d09b321abf75a8db7282b9eba1f8beee7475a530da24c2915babf230481acb9ae44a8a23bfb3db46a344eccf616f3c39ca00039734996a75fd3c624f SHA512 2ab47be98daeffa43c7651bebc045d819aea42375a2bff30e09f545080cf7f1337d4e38a9108077499c9cdbee1eb310c574b640b043be9631eb7fabc8c41261c -EBUILD privacyideaadm-3.0.ebuild 1008 BLAKE2B f13708941d6e125723d99ef2c25bf4e3ba019b6687687a2ebf245518da0c0f6f4fe0e5321f2f713173c41b121279daefb172bb9542fd0d8e816240f825d99a50 SHA512 d0f45c84f9debea87f0bc91383b5caee6fed8ef7b61d5b077030fcedbb37bcf3b0732adf7b2cdc30a61771985e5b323dd33b2f6931c71bb70e5033e2b2fa430f +EBUILD privacyideaadm-2.23.5.ebuild 1008 BLAKE2B f04e42b205fc2d2c84306f4d3c15b5ef09e1df9fca55d66ccc43afb78b1d2b1921d1c785d390c02c3ada6c36ec173eb972d1ce22b194e7acd5cb1bf5c096430a SHA512 bb5126702f949ac2e25953f9aa1c9c347fc2ba4169d1ffab4078db9ece1c16931737506f453780856ef06bc8078028a1a3431957863005c4db24a31dbc4e45ff +EBUILD privacyideaadm-3.0.ebuild 1038 BLAKE2B c77b647f6d7bd860323551bc6ca7c8d58b86cc372cc354e332300ddcb3d2b43a1edbd25eb30cd53e1ead393a4c8e5669d7b6eabb130cc89a25b704d486265e2a SHA512 c527d74d133918e8770f92f5cca08aa8230f9ae64f0321dd389571a41d784057f5524161422215c37f38056e2f067882dbbcb15a826a7f4deccf51808271a7c7 diff --git a/www-apps/privacyideaadm/privacyideaadm-2.23.5.ebuild b/www-apps/privacyideaadm/privacyideaadm-2.23.5.ebuild index def6cd2..a5451c1 100644 --- a/www-apps/privacyideaadm/privacyideaadm-2.23.5.ebuild +++ b/www-apps/privacyideaadm/privacyideaadm-2.23.5.ebuild @@ -4,7 +4,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{5,6,7} ) +PYTHON_COMPAT=( python3_{5,6,7,8} ) PV_COMMIT="c92f510520ffb32374dc35298e2c865644f1d691" diff --git a/www-apps/privacyideaadm/privacyideaadm-3.0.ebuild b/www-apps/privacyideaadm/privacyideaadm-3.0.ebuild index 8e40a67..8028261 100644 --- a/www-apps/privacyideaadm/privacyideaadm-3.0.ebuild +++ b/www-apps/privacyideaadm/privacyideaadm-3.0.ebuild @@ -2,9 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=6 +EAPI=8 -PYTHON_COMPAT=( python3_{5,6,7,8} ) +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) PV_COMMIT="96eadf89893d73de480b6fe6a06dcf88c69cb7f6"