From ec90aa875133a48b40c9305757fa3a83d95815dd Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 5 Jul 2020 12:58:22 +0200 Subject: [PATCH 1/7] dev-python/graphql-core: dep of graphql-relay cleaned from ::gentoo fixed up the ebuild, maintainer is needed Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andrew Ammerlaan --- dev-python/graphql-core/Manifest | 1 + .../graphql-core/graphql-core-3.0.5.ebuild | 23 +++++++++++++++++++ dev-python/graphql-core/metadata.xml | 6 +++++ 3 files changed, 30 insertions(+) create mode 100644 dev-python/graphql-core/Manifest create mode 100644 dev-python/graphql-core/graphql-core-3.0.5.ebuild create mode 100644 dev-python/graphql-core/metadata.xml diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest new file mode 100644 index 0000000000..3b42943cdd --- /dev/null +++ b/dev-python/graphql-core/Manifest @@ -0,0 +1 @@ +DIST graphql-core-3.0.5.tar.gz 462955 BLAKE2B 21d2b814ea4d2e330c6f936f4f7a34e84de43b327bd40f7e5c94c677cfdfb2db03c27c18fc4cd5d9a4eca0330f3a306efe1942bf08e96923d9444c5976960a86 SHA512 89ee9c2b039f3aa50ee032a679f2145480d63ec8aad3ac02273c301949740fb44f4b406ed5116b5466bb870997012416f0ea1367bdb2de5f82407168b1995a8b diff --git a/dev-python/graphql-core/graphql-core-3.0.5.ebuild b/dev-python/graphql-core/graphql-core-3.0.5.ebuild new file mode 100644 index 0000000000..b76518b39e --- /dev/null +++ b/dev-python/graphql-core/graphql-core-3.0.5.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 + +DESCRIPTION="GraphQL for Python" +HOMEPAGE="https://github.com/graphql-python/graphql-core" +SRC_URI="https://github.com/graphql-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +BDEPEND="test? ( + dev-python/pytest-benchmark[${PYTHON_USEDEP}] +)" + +distutils_enable_tests pytest +distutils_enable_sphinx docs dev-python/sphinx_rtd_theme diff --git a/dev-python/graphql-core/metadata.xml b/dev-python/graphql-core/metadata.xml new file mode 100644 index 0000000000..a0a60d7147 --- /dev/null +++ b/dev-python/graphql-core/metadata.xml @@ -0,0 +1,6 @@ + + + + + + From cb9955f362c2208f53de444da371fd5fc11ec197 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 5 Jul 2020 13:05:27 +0200 Subject: [PATCH 2/7] dev-python/graphql-relay: add py3_7,8, fix tests Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andrew Ammerlaan --- dev-python/graphql-relay/graphql-relay-3.0.0.ebuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild b/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild index 03c65f4b88..cee3add124 100644 --- a/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild +++ b/dev-python/graphql-relay/graphql-relay-3.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=(python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit distutils-r1 @@ -15,9 +15,13 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -# most likely we need a newer version of graphql-core -RESTRICT="test" +BDEPEND="test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] +)" -RDEPEND="dev-python/graphql-core[${PYTHON_USEDEP}]" +RDEPEND=" + dev-python/graphql-core[${PYTHON_USEDEP}] + dev-python/typing-extensions[${PYTHON_USEDEP}] +" distutils_enable_tests pytest From bdfa2c35820ddb3d30c3682288b32c0969b1ede1 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 5 Jul 2020 13:15:54 +0200 Subject: [PATCH 3/7] dev-python/graphql-core: version bump Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andrew Ammerlaan --- dev-python/graphql-core/Manifest | 2 +- .../{graphql-core-3.0.5.ebuild => graphql-core-3.1.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dev-python/graphql-core/{graphql-core-3.0.5.ebuild => graphql-core-3.1.1.ebuild} (100%) diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest index 3b42943cdd..725f60e9be 100644 --- a/dev-python/graphql-core/Manifest +++ b/dev-python/graphql-core/Manifest @@ -1 +1 @@ -DIST graphql-core-3.0.5.tar.gz 462955 BLAKE2B 21d2b814ea4d2e330c6f936f4f7a34e84de43b327bd40f7e5c94c677cfdfb2db03c27c18fc4cd5d9a4eca0330f3a306efe1942bf08e96923d9444c5976960a86 SHA512 89ee9c2b039f3aa50ee032a679f2145480d63ec8aad3ac02273c301949740fb44f4b406ed5116b5466bb870997012416f0ea1367bdb2de5f82407168b1995a8b +DIST graphql-core-3.1.1.tar.gz 481087 BLAKE2B e7bf05f4da9aa1c37acf802b830c05427a3f10fd36a716f194bb21ba3812ae5322534c67b692135a901f23dd48d46fe404a46b2b90cc7ee3862241a6381fd405 SHA512 62bef44d7d73eff1f1dc05e169fd765d4ea4d9716bbde26bc20ee826eb4fa78bb41deed1a196c37a24d4c5aa7e7965de86bee441c4a53f0b18f0cb2364d4cdec diff --git a/dev-python/graphql-core/graphql-core-3.0.5.ebuild b/dev-python/graphql-core/graphql-core-3.1.1.ebuild similarity index 100% rename from dev-python/graphql-core/graphql-core-3.0.5.ebuild rename to dev-python/graphql-core/graphql-core-3.1.1.ebuild From 9479fbb7c196658779e0b2e0d2cc524e8c23be08 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 5 Jul 2020 13:35:52 +0200 Subject: [PATCH 4/7] dev-python/graphene: version bump fix tests Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andrew Ammerlaan --- dev-python/graphene/Manifest | 1 + dev-python/graphene/graphene-2.1.8.ebuild | 17 ++++--- .../graphene/graphene-3.0.0_beta3.ebuild | 44 +++++++++++++++++++ 3 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 dev-python/graphene/graphene-3.0.0_beta3.ebuild diff --git a/dev-python/graphene/Manifest b/dev-python/graphene/Manifest index 08f9b68e91..3808419af6 100644 --- a/dev-python/graphene/Manifest +++ b/dev-python/graphene/Manifest @@ -1 +1,2 @@ DIST graphene-2.1.8.tar.gz 102179 BLAKE2B 45c61f0f5965828f4b623a1a78678afdd9ef180c0ac83ff6d13ac4385479a787166e7401d75b4314cd125c623ebab7f43337fe2b00db471c1c8751177ca8b264 SHA512 238108c2047b9942de22f21b90581bbda42fb85ee3588ed5d4a26bd54784a6a71407c7a4e8308726ab22b6a62317e94253a60d1771272969e00e0097f3614d51 +DIST graphene-3.0.0_beta3.tar.gz 108606 BLAKE2B 20b1af8400b1fe3721eafb1ce6884702653c58931933d0e3d6058180c115b48bf00a59cc7b6feb61648e9a85195033d0b0ff8c7e4e44822c77b1904cfc3c3b45 SHA512 65b920e5d10d080678df5c9a57d173baab421a3d2c676d943fb3e25fe596cc3623ddb6987322dbdc47d3b299e8f4363e4136bdcd2df0af3c1cf4117e7bb18375 diff --git a/dev-python/graphene/graphene-2.1.8.ebuild b/dev-python/graphene/graphene-2.1.8.ebuild index 52cadcadf3..a5836aba42 100644 --- a/dev-python/graphene/graphene-2.1.8.ebuild +++ b/dev-python/graphene/graphene-2.1.8.ebuild @@ -15,14 +15,12 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -# We need newer graphql-core -RESTRICT="test" - RDEPEND=" - dev-python/aniso8601[${PYTHON_USEDEP}] + <=dev-python/aniso8601-7[${PYTHON_USEDEP}] dev-python/graphql-core[${PYTHON_USEDEP}] dev-python/graphql-relay[${PYTHON_USEDEP}] - dev-python/unidecode[${PYTHON_USEDEP}]" + dev-python/unidecode[${PYTHON_USEDEP}] +" DEPEND="test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] @@ -30,7 +28,8 @@ DEPEND="test? ( dev-python/promises[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] dev-python/pytz[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] )" + dev-python/iso8601[${PYTHON_USEDEP}] +)" python_prepare_all() { # Package installs 'examples' package which is forbidden and likely a bug in the build system. @@ -43,3 +42,9 @@ distutils_enable_tests pytest # ModuleNotFoundError: No module named 'sphinx_graphene_theme' # There is a github, but no releases at the moment #distutils_enable_sphinx docs + +python_test() { + #distutils_install_for_testing + PYTHONPATH="${S}" + pytest -vv || die "Tests fail with ${EPYHTON}" +} diff --git a/dev-python/graphene/graphene-3.0.0_beta3.ebuild b/dev-python/graphene/graphene-3.0.0_beta3.ebuild new file mode 100644 index 0000000000..d13504753a --- /dev/null +++ b/dev-python/graphene/graphene-3.0.0_beta3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_6 ) + +inherit distutils-r1 + +MYPV="${PV/_beta/b}" +MYP="${PN}-${MYPV}" + +DESCRIPTION="GraphQL Framework for Python" +HOMEPAGE="https://github.com/graphql-python/graphene" +SRC_URI="https://github.com/graphql-python/${PN}/archive/v${MYPV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/aniso8601[${PYTHON_USEDEP}] + dev-python/graphql-core[${PYTHON_USEDEP}] + dev-python/graphql-relay[${PYTHON_USEDEP}] + dev-python/unidecode[${PYTHON_USEDEP}] +" + +DEPEND="test? ( + dev-python/iso8601[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/promises[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-benchmark[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/snapshottest[${PYTHON_USEDEP}] +)" + +S="${WORKDIR}/${MYP}" + +distutils_enable_tests pytest +# ModuleNotFoundError: No module named 'sphinx_graphene_theme' +# There is a archived github, but no releases at the moment +#distutils_enable_sphinx docs From 692405bdd73e3af4a3aa9294cfe0e5a7e15860da Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 5 Jul 2020 13:39:11 +0200 Subject: [PATCH 5/7] dev-python/graphene: cleanup old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andrew Ammerlaan --- dev-python/graphene/Manifest | 1 - dev-python/graphene/graphene-2.1.8.ebuild | 50 ----------------------- 2 files changed, 51 deletions(-) delete mode 100644 dev-python/graphene/graphene-2.1.8.ebuild diff --git a/dev-python/graphene/Manifest b/dev-python/graphene/Manifest index 3808419af6..f863f69fe7 100644 --- a/dev-python/graphene/Manifest +++ b/dev-python/graphene/Manifest @@ -1,2 +1 @@ -DIST graphene-2.1.8.tar.gz 102179 BLAKE2B 45c61f0f5965828f4b623a1a78678afdd9ef180c0ac83ff6d13ac4385479a787166e7401d75b4314cd125c623ebab7f43337fe2b00db471c1c8751177ca8b264 SHA512 238108c2047b9942de22f21b90581bbda42fb85ee3588ed5d4a26bd54784a6a71407c7a4e8308726ab22b6a62317e94253a60d1771272969e00e0097f3614d51 DIST graphene-3.0.0_beta3.tar.gz 108606 BLAKE2B 20b1af8400b1fe3721eafb1ce6884702653c58931933d0e3d6058180c115b48bf00a59cc7b6feb61648e9a85195033d0b0ff8c7e4e44822c77b1904cfc3c3b45 SHA512 65b920e5d10d080678df5c9a57d173baab421a3d2c676d943fb3e25fe596cc3623ddb6987322dbdc47d3b299e8f4363e4136bdcd2df0af3c1cf4117e7bb18375 diff --git a/dev-python/graphene/graphene-2.1.8.ebuild b/dev-python/graphene/graphene-2.1.8.ebuild deleted file mode 100644 index a5836aba42..0000000000 --- a/dev-python/graphene/graphene-2.1.8.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="GraphQL Framework for Python" -HOMEPAGE="https://github.com/graphql-python/graphene" -SRC_URI="https://github.com/graphql-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - <=dev-python/aniso8601-7[${PYTHON_USEDEP}] - dev-python/graphql-core[${PYTHON_USEDEP}] - dev-python/graphql-relay[${PYTHON_USEDEP}] - dev-python/unidecode[${PYTHON_USEDEP}] -" - -DEPEND="test? ( - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/promises[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] -)" - -python_prepare_all() { - # Package installs 'examples' package which is forbidden and likely a bug in the build system. - rm -r examples || die - - distutils-r1_python_prepare_all -} - -distutils_enable_tests pytest -# ModuleNotFoundError: No module named 'sphinx_graphene_theme' -# There is a github, but no releases at the moment -#distutils_enable_sphinx docs - -python_test() { - #distutils_install_for_testing - PYTHONPATH="${S}" - pytest -vv || die "Tests fail with ${EPYHTON}" -} From a5a90e06c063bc0ac6935a4a446ed5287d6cfd3c Mon Sep 17 00:00:00 2001 From: Michael Egger Date: Sun, 5 Jul 2020 13:47:13 +0200 Subject: [PATCH 6/7] sys-apps/flatpak: bump to 1.8.1 Signed-off-by: Michael Egger --- sys-apps/flatpak/Manifest | 2 +- sys-apps/flatpak/{flatpak-1.8.0.ebuild => flatpak-1.8.1.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sys-apps/flatpak/{flatpak-1.8.0.ebuild => flatpak-1.8.1.ebuild} (100%) diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest index ab18c1dfa6..0acf5973f6 100644 --- a/sys-apps/flatpak/Manifest +++ b/sys-apps/flatpak/Manifest @@ -1 +1 @@ -DIST flatpak-1.8.0.tar.xz 1401336 BLAKE2B d606e56abf3e2db98b4a38e3dd5bf64bcf4a9aa818fcd32fa27c9fad94d7df222853910efea8fa66549c581d00f890b619f2379553777339a1132a03c1415681 SHA512 2955eadddcea2baecb36b45a638a33735a934641dd99793d22d7193d58ffd02910ae1239d9450f9b4c5bf648e6aa0f29efcc17a2bc7bd26936a9ea7b53af3f72 +DIST flatpak-1.8.1.tar.xz 1423484 BLAKE2B 74ae70668f02c99f97d2239d12f12b0a6cd403c9920b2edd3dae5119bdae3095d743fb416a3a9ebdd71a3e9b8232755b1a4813934e541d874cba0b811d6f7041 SHA512 37c1b1a4c64cae06f94d6e2c9715c8db996fc66574abbc0d2f41d695e36e5ff8812121c1a704f4fb20b552ff9af8125314e4436b15a85f86dba2053c5ed477d8 diff --git a/sys-apps/flatpak/flatpak-1.8.0.ebuild b/sys-apps/flatpak/flatpak-1.8.1.ebuild similarity index 100% rename from sys-apps/flatpak/flatpak-1.8.0.ebuild rename to sys-apps/flatpak/flatpak-1.8.1.ebuild From f321f8406f4e26a141924b9c74e30e12b2fb0ce9 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 5 Jul 2020 13:50:26 +0200 Subject: [PATCH 7/7] dev-python/starlette: minor changes tried to get tests working now that we have newer graphql but didn't work :( Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andrew Ammerlaan --- dev-python/starlette/starlette-0.13.4.ebuild | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dev-python/starlette/starlette-0.13.4.ebuild b/dev-python/starlette/starlette-0.13.4.ebuild index 84b0d96a0f..d337b9756c 100644 --- a/dev-python/starlette/starlette-0.13.4.ebuild +++ b/dev-python/starlette/starlette-0.13.4.ebuild @@ -22,13 +22,13 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc" - -# ModuleNotFoundError: No module named 'graphql.pyutils.compat' -# We need newer graphql-core +# ModuleNotFoundError: No module named 'graphql.execution.executors' +# Now graphql is at the newest version and this still doesn't work :( +# though there are less errors now RESTRICT="test" DEPEND="test? ( + dev-python/aiosqlite[${PYTHON_USEDEP}] dev-python/aiofiles[${PYTHON_USEDEP}] dev-python/black[${PYTHON_USEDEP}] dev-python/databases[${PYTHON_USEDEP}] @@ -40,7 +40,8 @@ DEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/sse-starlette[${PYTHON_USEDEP}] dev-python/ujson[${PYTHON_USEDEP}] - dev-python/graphene[${PYTHON_USEDEP}] )" + dev-python/graphene[${PYTHON_USEDEP}] +)" python_prepare_all() { # do not install LICENSE to /usr/