diff --git a/dev-python/editorconfig/Manifest b/dev-python/editorconfig/Manifest deleted file mode 100644 index d7bb4b885..000000000 --- a/dev-python/editorconfig/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST EditorConfig-0.12.2.tar.gz 13485 BLAKE2B 11408c8aa2b1bd31588d1f58dc22a409802642ba09d20a138f441465155eaec01df058e17c08844e4f7c6a5bb549548235584e15ee19f7a7ef937065cd0da0eb SHA512 15648904683e04b68966651ebf2046b60473a47a408dff257d64d06b6c0cc6765882ebf5ec0e0ccaf5dc7e78e93b5f9bdf129ae0e2a23f7f489cb50c9ae3ff16 diff --git a/dev-python/editorconfig/editorconfig-0.12.2.ebuild b/dev-python/editorconfig/editorconfig-0.12.2.ebuild deleted file mode 100644 index 96648abe1..000000000 --- a/dev-python/editorconfig/editorconfig-0.12.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{9..10} ) - -inherit distutils-r1 - -MY_PN=EditorConfig -MY_P=${MY_PN}-${PV} - -DESCRIPTION="EditorConfig File Locator and Interpreter for Python" -HOMEPAGE="https://pypi.python.org/pypi/EditorConfig" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="PSF-2.4" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -S=${WORKDIR}/${MY_P} diff --git a/dev-python/editorconfig/metadata.xml b/dev-python/editorconfig/metadata.xml deleted file mode 100644 index ace7c2d3a..000000000 --- a/dev-python/editorconfig/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - unknown@pentoo.ch - Author Unknown - - diff --git a/dev-python/google-cloud-dialogflow/Manifest b/dev-python/google-cloud-dialogflow/Manifest new file mode 100644 index 000000000..92fff82b4 --- /dev/null +++ b/dev-python/google-cloud-dialogflow/Manifest @@ -0,0 +1 @@ +DIST google-cloud-dialogflow-2.16.1.tar.gz 1240619 BLAKE2B 70e9a2b5497a81eba0c5269f046fc0c64180c64dc5cbfa6cc026da3172d84c951fa831c69eefe3c7492fe649802b0db2c505a4ec64bf6c399071cf9bed79b249 SHA512 32d211b8730ac19d6c473c3cca8e732a9c9931116612348bcad0f1dd991c37da3c03a19bcee4940fdb00110e51696d974217b70704c51adcb4e330017db8cdb4 diff --git a/dev-python/google-cloud-dialogflow/google-cloud-dialogflow-2.16.1.ebuild b/dev-python/google-cloud-dialogflow/google-cloud-dialogflow-2.16.1.ebuild new file mode 100644 index 000000000..549ad3eca --- /dev/null +++ b/dev-python/google-cloud-dialogflow/google-cloud-dialogflow-2.16.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +#https://projects.gentoo.org/python/guide/distutils.html#pep-517-build-systems +#DISTUTILS_USE_PEP517=poetry +PYTHON_COMPAT=( python3_{9..10} ) + +inherit distutils-r1 + +DESCRIPTION="Client library for the Dialogflow API" +HOMEPAGE="https://github.com/googleapis/python-dialogflow" +SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +#IUSE="test" +IUSE="" + +RDEPEND=" + dev-python/google-api-core[${PYTHON_USEDEP}] + dev-python/proto-plus[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] + +" +DEPEND="${RDEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +#distutils_enable_tests pytest + +src_prepare(){ + rm -r tests + eapply_user +} diff --git a/dev-python/jsbeautifier/Manifest b/dev-python/jsbeautifier/Manifest index 18c605ad3..02a362d90 100644 --- a/dev-python/jsbeautifier/Manifest +++ b/dev-python/jsbeautifier/Manifest @@ -1,2 +1,2 @@ -DIST jsbeautifier-1.13.0.tar.gz 72016 BLAKE2B 061321a5eea0aafd355c4e3ea4227b385b38e9726d1ed80f81dcac4a1f4d6cd15c077cdda51c279ac8cf72976cc1e4dad3834c89d25c8067d1e449ba76bd42ab SHA512 2ae74b8579cedab0d7d1954e91f1a89228eed8dd0f568a52978fdc57ff4369eb69054f5ec207ccd0e687404371d47d71a9a816253021687c3abb5484f8392b9a DIST jsbeautifier-1.14.0.tar.gz 73041 BLAKE2B 88618817f06c9fad797ed225b3a20b371c8fe52861856b216c939658f9045b9de23b78cf552e0b86c73171de32bf1a87de3307cfe628f24f0af3aa0e2231c4bb SHA512 01a7907c365228f77368869a736ec8df229fcc6f58932d29c9c8a8c0db1d59d217ffa9375d812b9352bf21a4e776b27b61fe9b0531cec33322c63de1b3d714d6 +DIST jsbeautifier-1.14.6.tar.gz 74554 BLAKE2B fd9761d352add4541d828f3a59f1e857968c8522230c32528fbd8f471e862246d3082649c8f9ee258adf291e0805793e06be3a9b3626ef169b366a3f87b6fd40 SHA512 503bcb5e805dc385a0463127590a00339ec8f6fc4ba6b6c1fc7eb3ff91310fa4bfd8a92112eec7d8c503452de2df2dc105642313ece396120befb84c142161fb diff --git a/dev-python/jsbeautifier/jsbeautifier-1.14.0.ebuild b/dev-python/jsbeautifier/jsbeautifier-1.14.0.ebuild index 7ab023644..df39ab436 100644 --- a/dev-python/jsbeautifier/jsbeautifier-1.14.0.ebuild +++ b/dev-python/jsbeautifier/jsbeautifier-1.14.0.ebuild @@ -17,5 +17,5 @@ KEYWORDS="amd64 ~arm64 x86" IUSE="" RDEPEND=">=dev-python/six-1.13.0[${PYTHON_USEDEP}] - >=dev-python/editorconfig-0.12.2[${PYTHON_USEDEP}]" + >=dev-python/editorconfig-core-py-0.12.2[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/dev-python/jsbeautifier/jsbeautifier-1.13.0.ebuild b/dev-python/jsbeautifier/jsbeautifier-1.14.6.ebuild similarity index 77% rename from dev-python/jsbeautifier/jsbeautifier-1.13.0.ebuild rename to dev-python/jsbeautifier/jsbeautifier-1.14.6.ebuild index 9282d6356..0abe2943a 100644 --- a/dev-python/jsbeautifier/jsbeautifier-1.13.0.ebuild +++ b/dev-python/jsbeautifier/jsbeautifier-1.14.6.ebuild @@ -1,9 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python3_{9..10} ) inherit distutils-r1 @@ -18,5 +17,5 @@ KEYWORDS="amd64 ~arm64 x86" IUSE="" RDEPEND=">=dev-python/six-1.13.0[${PYTHON_USEDEP}] - >=dev-python/editorconfig-0.12.2[${PYTHON_USEDEP}]" + >=dev-python/editorconfig-core-py-0.12.2[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python index 246e63526..1cbc05959 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-python +++ b/profiles/pentoo/base/package.accept_keywords/dev-python @@ -382,3 +382,6 @@ dev-python/pyvnc #required by winacl ~dev-python/cryptography-38.0.1 + +#dev-python/jsbeautifier +~dev-python/editorconfig-core-py-0.12.3 diff --git a/profiles/pentoo/base/package.use/app-text b/profiles/pentoo/base/package.use/app-text index 7c8fa5193..a3889ba1f 100644 --- a/profiles/pentoo/base/package.use/app-text +++ b/profiles/pentoo/base/package.use/app-text @@ -3,3 +3,6 @@ app-text/texlive-core xetex #build pdfsig app-text/poppler nss + +#required by dev-python/jsbeautifier +app-text/editorconfig-core-c -cli diff --git a/scripts/python_dependencies.py b/scripts/python_dependencies.py index b6da6c985..2ad7197f7 100755 --- a/scripts/python_dependencies.py +++ b/scripts/python_dependencies.py @@ -25,6 +25,7 @@ def portage_mapping(search): "dev-python/capstone": "dev-libs/capstone[python]", "dev-python/colored_traceback": "dev-python/colored-traceback", "dev-python/Django": "dev-python/django", + "dev-python/editorconfig": "dev-python/editorconfig-core-py", "dev-python/flask-BabelEx": "dev-python/flask-babelex", "dev-python/flask_caching": "dev-python/flask-caching", "dev-python/Flask": "dev-python/flask", @@ -43,6 +44,7 @@ def portage_mapping(search): "dev-python/Markdown": "dev-python/markdown", "dev-python/openstep-parser": "dev-python/openstep_parser", "dev-python/Pillow": "dev-python/pillow", + "dev-python/protobuf": "dev-python/protobuf-python", "dev-python/pjsip": "net-libs/pjproject", "dev-python/prompt-toolkit": "dev-python/prompt_toolkit", "dev-python/protego": "dev-python/Protego",