diff options
Diffstat (limited to 'dev-db/pgcli')
| -rw-r--r-- | dev-db/pgcli/Manifest | 2 | ||||
| -rw-r--r-- | dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch | 37 | ||||
| -rw-r--r-- | dev-db/pgcli/pgcli-2.2.0.ebuild | 44 | ||||
| -rw-r--r-- | dev-db/pgcli/pgcli-3.0.0-r1.ebuild (renamed from dev-db/pgcli/pgcli-3.0.0.ebuild) | 29 | ||||
| -rw-r--r-- | dev-db/pgcli/pgcli-3.1.0.ebuild | 37 |
5 files changed, 88 insertions, 61 deletions
diff --git a/dev-db/pgcli/Manifest b/dev-db/pgcli/Manifest index 6db8480edc11..f22aac8bbf3f 100644 --- a/dev-db/pgcli/Manifest +++ b/dev-db/pgcli/Manifest @@ -1,2 +1,2 @@ -DIST pgcli-2.2.0.tar.gz 436991 BLAKE2B 9041240952a8ba9a770705850bf4281eaa89ac5b970366c7ec27e705bec65d9c3c455fb2c9d2220d53f4a9ff31142501437faa6974839f6fe59e6fc1618d8a6d SHA512 239a3278b604248b7bd5cdaf4d0b0f3e62188617b04c358d123e2fa2ad1449c3854ef84995b89239fcf559ce010ee0dd80e12ddd72b27dcb89f92ac08d34c49b DIST pgcli-3.0.0.tar.gz 437733 BLAKE2B 5db69997f675812c3ef847b220b66e7872b134b4d8debd668154bdfa6020432ac08829e7c2ce42adc4cf124e84de5eb9aacbe19636216502f81373a71f21b68f SHA512 7ac52cbfc492dc85163dac7df7a5dde6bfa0327ac1ef6580891cb76d617b998d74c2a59b27d2f8abf8699eb5a69aba30bf13e95ad7bee75c83350730ac061262 +DIST pgcli-3.1.0.tar.gz 441939 BLAKE2B 2c9c9a3afb233eee6f88d304e26e482760f1ff2a458103a80ffb80d877f63bd3ec74ba4be06238e8d78adf36ec251cd27849e0899f3b257b75ac9585f3c04572 SHA512 458871bf7ea0a83a66f44ecbde88590ca2aa08420a58c97d2716d4e36c61738d92283d007fc3968063daa01c25b2c46360292ad6339757c119ff04891e1a1c46 diff --git a/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch b/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch new file mode 100644 index 000000000000..4403a2e9c037 --- /dev/null +++ b/dev-db/pgcli/files/pgcli-3.0.0-sqlparse.patch @@ -0,0 +1,37 @@ +Taken from: https://github.com/dbcli/pgcli/pull/1224 +Author: Kevin Marsh <kevinmarsh3@gmail.com> + +--- a/pgcli/packages/parseutils/ctes.py ++++ b/pgcli/packages/parseutils/ctes.py +@@ -16,7 +16,7 @@ + def isolate_query_ctes(full_text, text_before_cursor): + """Simplify a query by converting CTEs into table metadata objects""" + +- if not full_text: ++ if not full_text or not full_text.strip(): + return full_text, text_before_cursor, tuple() + + ctes, remainder = extract_ctes(full_text) +--- a/setup.py ++++ b/setup.py +@@ -13,7 +13,7 @@ + # see: https://github.com/dbcli/pgcli/pull/1197 + "prompt_toolkit>=2.0.6,<4.0.0", + "psycopg2 >= 2.8", +- "sqlparse >=0.3.0,<0.4", ++ "sqlparse >=0.3.0,<0.5", + "configobj >= 5.0.6", + "pendulum>=2.1.0", + "cli_helpers[styles] >= 2.0.0", +--- a/tests/test_sqlcompletion.py ++++ b/tests/test_sqlcompletion.py +@@ -816,7 +816,7 @@ def test_create_db_with_template(): + assert set(suggestions) == set((Database(),)) + + +-@pytest.mark.parametrize("initial_text", ("", " ", "\t \t")) ++@pytest.mark.parametrize("initial_text", ("", " ", "\t \t", "\n")) + def test_specials_included_for_initial_completion(initial_text): + suggestions = suggest_type(initial_text, initial_text) + + diff --git a/dev-db/pgcli/pgcli-2.2.0.ebuild b/dev-db/pgcli/pgcli-2.2.0.ebuild deleted file mode 100644 index 2074ed71be78..000000000000 --- a/dev-db/pgcli/pgcli-2.2.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8,9,10} ) -inherit distutils-r1 - -DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting" -HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli" -SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-python/prompt_toolkit-2.0.6[${PYTHON_USEDEP}] - <dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}] - >=dev-python/psycopg-2.8.0[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}] - <dev-python/sqlparse-0.4.0[${PYTHON_USEDEP}] - >=dev-python/cli_helpers-1.2.0[${PYTHON_USEDEP}] - >=dev-python/click-4.1[${PYTHON_USEDEP}] - >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] - >=dev-python/humanize-0.5.1[${PYTHON_USEDEP}] - >=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}] - >=dev-python/pygments-2.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -BDEPEND=" - test? ( - dev-db/postgresql - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -# there is a flaky test, so no tests for now -RESTRICT="test" - -distutils_enable_tests pytest diff --git a/dev-db/pgcli/pgcli-3.0.0.ebuild b/dev-db/pgcli/pgcli-3.0.0-r1.ebuild index 11d5f0de8832..9a187cbe87e7 100644 --- a/dev-db/pgcli/pgcli-3.0.0.ebuild +++ b/dev-db/pgcli/pgcli-3.0.0-r1.ebuild @@ -13,29 +13,26 @@ SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD MIT" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/cli_helpers[${PYTHON_USEDEP}] + dev-python/configobj[${PYTHON_USEDEP}] + dev-python/humanize[${PYTHON_USEDEP}] + dev-python/pgspecial[${PYTHON_USEDEP}] >=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}] - <dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}] - >=dev-python/psycopg-2.8.0[${PYTHON_USEDEP}] - >=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}] - <dev-python/sqlparse-0.4.0[${PYTHON_USEDEP}] - >=dev-python/cli_helpers-1.2.0[${PYTHON_USEDEP}] - >=dev-python/click-4.1[${PYTHON_USEDEP}] - >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}] - >=dev-python/humanize-0.5.1[${PYTHON_USEDEP}] - >=dev-python/pgspecial-1.11.8[${PYTHON_USEDEP}] - >=dev-python/pygments-2.0[${PYTHON_USEDEP}] - >=dev-python/setproctitle-1.1.9[${PYTHON_USEDEP}] -" + dev-python/psycopg[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/sqlparse[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" - BDEPEND=" test? ( dev-db/postgresql dev-python/mock[${PYTHON_USEDEP}] - ) -" + )" + +PATCHES=( "${FILESDIR}"/${P}-sqlparse.patch ) distutils_enable_tests pytest diff --git a/dev-db/pgcli/pgcli-3.1.0.ebuild b/dev-db/pgcli/pgcli-3.1.0.ebuild new file mode 100644 index 000000000000..de832c6dd2fa --- /dev/null +++ b/dev-db/pgcli/pgcli-3.1.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +inherit distutils-r1 + +DESCRIPTION="CLI for Postgres with auto-completion and syntax highlighting" +HOMEPAGE="https://www.pgcli.com https://github.com/dbcli/pgcli" +SRC_URI="https://github.com/dbcli/pgcli/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/cli_helpers[${PYTHON_USEDEP}] + dev-python/configobj[${PYTHON_USEDEP}] + dev-python/pendulum[${PYTHON_USEDEP}] + dev-python/pgspecial[${PYTHON_USEDEP}] + dev-python/prompt_toolkit[${PYTHON_USEDEP}] + dev-python/psycopg[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/sqlparse[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-db/postgresql + dev-python/mock[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest |