From 521feee55f0ae5c73a56a5b9d67f5ee26f05a5c2 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.4. --- srcpkgs/python3-sqlparse/template | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/srcpkgs/python3-sqlparse/template b/srcpkgs/python3-sqlparse/template index 268097f90641..80000e7871f5 100644 --- a/srcpkgs/python3-sqlparse/template +++ b/srcpkgs/python3-sqlparse/template @@ -1,21 +1,19 @@ # Template file for 'python3-sqlparse' pkgname=python3-sqlparse -version=0.3.0 -revision=6 -build_style=python3-module -hostmakedepends="python3-setuptools" -depends="python3-setuptools" +version=0.4.4 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-flit_core" +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=7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873 +checksum=d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c alternatives="sqlparse:sqlformat:/usr/bin/sqlformat3" -# sys.stdout.encoding = 'utf-8' AttributeError: readonly attribute -# will be fixed in 0.4.0 -make_check=no post_install() { mv ${DESTDIR}/usr/bin/sqlformat{,3} From f851e97b606be43961d13415a64263540c09ab8b 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 4195ff06b006c625908a740d7fd4750ed19fe994 Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer Date: Fri, 31 Mar 2023 08:34:56 -0400 Subject: [PATCH 3/3] python3-sqlalchemy-migrate: update to 0.13.0. --- .../patches/argspec.patch | 13 +++++++++++++ .../patches/versionspec.patch | 13 +++++++++++++ srcpkgs/python3-sqlalchemy-migrate/template | 10 +++++----- 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/python3-sqlalchemy-migrate/patches/argspec.patch create mode 100644 srcpkgs/python3-sqlalchemy-migrate/patches/versionspec.patch diff --git a/srcpkgs/python3-sqlalchemy-migrate/patches/argspec.patch b/srcpkgs/python3-sqlalchemy-migrate/patches/argspec.patch new file mode 100644 index 000000000000..c8e201b0ca6d --- /dev/null +++ b/srcpkgs/python3-sqlalchemy-migrate/patches/argspec.patch @@ -0,0 +1,13 @@ +diff --git a/migrate/versioning/shell.py b/migrate/versioning/shell.py +index 5fb86b1..fae0ce4 100644 +--- a/migrate/versioning/shell.py ++++ b/migrate/versioning/shell.py +@@ -108,7 +108,7 @@ def main(argv=None, **kwargs): + parser.error("Invalid command %s" % command) + + parser.set_usage(inspect.getdoc(command_func)) +- f_args, f_varargs, f_kwargs, f_defaults = inspect.getargspec(command_func) ++ f_args, f_varargs, f_kwargs, f_defaults, _, _, _ = inspect.getfullargspec(command_func) + for arg in f_args: + parser.add_option( + "--%s" % arg, diff --git a/srcpkgs/python3-sqlalchemy-migrate/patches/versionspec.patch b/srcpkgs/python3-sqlalchemy-migrate/patches/versionspec.patch new file mode 100644 index 000000000000..3dc56d64e4f6 --- /dev/null +++ b/srcpkgs/python3-sqlalchemy-migrate/patches/versionspec.patch @@ -0,0 +1,13 @@ +error in setup command: 'tests_require' must be a string or list of strings containing valid project/version requirement specifiers; Expected end or semicolon (after version specifier) + pytz>=2010h + ~~~~~~^ +diff --git a/test-requirements.txt b/test-requirements.txt +index bc8d8d2..f997bf9 100644 +--- a/test-requirements.txt ++++ b/test-requirements.txt +@@ -27,4 +27,4 @@ scripttest + # NOTE(rpodolyaka): This version identifier is currently necessary as + # pytz otherwise does not install on pip 1.4 or higher + pylint +-pytz>=2010h ++pytz>=2010 diff --git a/srcpkgs/python3-sqlalchemy-migrate/template b/srcpkgs/python3-sqlalchemy-migrate/template index aba3c5e56f00..3f350e2a6781 100644 --- a/srcpkgs/python3-sqlalchemy-migrate/template +++ b/srcpkgs/python3-sqlalchemy-migrate/template @@ -1,18 +1,18 @@ # Template file for 'python3-sqlalchemy-migrate' pkgname=python3-sqlalchemy-migrate -version=0.12.0 -revision=6 +version=0.13.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools python3-pbr" depends="python3-pbr python3-SQLAlchemy python3-decorator python3-six - python3-sqlparse python3-tempita" + python3-sqlparse python3-tempita python3-setuptools" checkdepends="python3-pytest python3-testtools ${depends}" short_desc="Database schema migration for SQLAlchemy (Python3)" maintainer="Orphaned " license="MIT" -homepage="https://github.com/stackforge/sqlalchemy-migrate" +homepage="https://opendev.org/x/sqlalchemy-migrate" distfiles="${PYPI_SITE}/s/sqlalchemy-migrate/sqlalchemy-migrate-${version}.tar.gz" -checksum=8cfada30bbcf79a83b3a2d1bcd637de7e1f43e390d54de33e4f3249fd9aacfae +checksum=0bc02e292a040ade5e35a01d3ea744119e1309cdddb704fdb99bac13236614f8 make_check=no # tests need a specific version of testtools alternatives="