From da7bdcf7d9159061340662c254aecd4c23f79748 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 Mar 2023 17:37:28 -0400 Subject: [PATCH 1/3] python3-sqlparse: update to 0.4.3. --- srcpkgs/python-sqlparse/template | 18 +++--------------- srcpkgs/python3-sqlparse | 1 - srcpkgs/python3-sqlparse/template | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 16 deletions(-) delete mode 120000 srcpkgs/python3-sqlparse create mode 100644 srcpkgs/python3-sqlparse/template diff --git a/srcpkgs/python-sqlparse/template b/srcpkgs/python-sqlparse/template index 791f925cac92..3495bd07706d 100644 --- a/srcpkgs/python-sqlparse/template +++ b/srcpkgs/python-sqlparse/template @@ -2,9 +2,8 @@ pkgname=python-sqlparse version=0.3.0 revision=6 -build_style=python-module -pycompile_module="sqlparse" -hostmakedepends="python-setuptools python3-setuptools" +build_style=python2-module +hostmakedepends="python-setuptools" depends="python-setuptools" short_desc="Non-validating SQL parser for Python2" maintainer="Orphaned " @@ -15,17 +14,6 @@ checksum=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873 alternatives="sqlparse:sqlformat:/usr/bin/sqlformat2" post_install() { + mv "$DESTDIR"/usr/bin/sqlformat{,2} vlicense LICENSE } - -python3-sqlparse_package() { - depends="python3-setuptools" - pycompile_module="sqlparse" - short_desc="${short_desc/Python2/Python3}" - alternatives="sqlparse:sqlformat:/usr/bin/sqlformat3" - pkg_install() { - vmove usr/bin/sqlformat3 - vmove usr/lib/python3* - vlicense LICENSE - } -} diff --git a/srcpkgs/python3-sqlparse b/srcpkgs/python3-sqlparse deleted file mode 120000 index c99cce656dc2..000000000000 --- a/srcpkgs/python3-sqlparse +++ /dev/null @@ -1 +0,0 @@ -python-sqlparse \ No newline at end of file diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template new file mode 100644 index 000000000000..d547f7d8b1e0 --- /dev/null +++ b/srcpkgs/python3-sqlparse/template @@ -0,0 +1,21 @@ +# Template file for 'python3-sqlparse' +pkgname=python3-sqlparse +version=0.4.3 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3" +checkdepends="python3-pytest" +short_desc="Non-validating SQL parser for Python3" +maintainer="Orphaned " +license="BSD-3-Clause" +homepage="https://github.com/andialbrecht/sqlparse" +changelog="https://raw.githubusercontent.com/andialbrecht/sqlparse/master/CHANGELOG" +distfiles="${PYPI_SITE}/s/sqlparse/sqlparse-${version}.tar.gz" +checksum=69ca804846bb114d2ec380e4360a8a340db83f0ccf3afceeb1404df028f57268 +alternatives="sqlparse:sqlformat:/usr/bin/sqlformat3" + +post_install() { + mv "$DESTDIR"/usr/bin/sqlformat{,3} + vlicense LICENSE +} From 17d4aceb33bcf17a4e0849aa7e6cb84d3b8c17cc Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 Mar 2023 17:52:46 -0400 Subject: [PATCH 2/3] pgcli: depend on python3-setuptools. --- srcpkgs/pgcli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template index db228c7c00d9..269222b28d3b 100644 --- a/srcpkgs/pgcli/template +++ b/srcpkgs/pgcli/template @@ -1,12 +1,12 @@ # Template file for 'pgcli' pkgname=pgcli version=3.5.0 -revision=2 +revision=3 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit python3-psycopg python3-sqlparse python3-configobj python3-pendulum - python3-cli_helpers python3-setproctitle" + python3-cli_helpers python3-setproctitle python3-setuptools" short_desc="PostgreSQL CLI with autocompletion and syntax highlighting" maintainer="Joel Beckmeyer " license="BSD-3-Clause" From 96bae05baf5f17fa32837f6210cd93c500254dde Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Thu, 30 Mar 2023 22:32:13 -0400 Subject: [PATCH 3/3] python3-yoyo-migrations: depend on python3-setuptools. --- srcpkgs/python3-yoyo-migrations/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-yoyo-migrations/template b/srcpkgs/python3-yoyo-migrations/template index bb9826beae2b..b2b046a57a17 100644 --- a/srcpkgs/python3-yoyo-migrations/template +++ b/srcpkgs/python3-yoyo-migrations/template @@ -1,10 +1,10 @@ # Template file for 'python3-yoyo-migrations' pkgname=python3-yoyo-migrations version=7.3.2 -revision=3 +revision=4 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-sqlparse" +depends="python3-sqlparse python3-setuptools" short_desc="Database migrations with SQL" maintainer="Đoàn Trần Công Danh " license="Apache-2.0"