[PR PATCH] pgcli: update to 3.4.0.

[PR PATCH] pgcli: update to 3.4.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages pgcli
https://github.com/void-linux/void-packages/pull/35841

pgcli: update to 3.4.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35841.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pgcli-35841.patch --]
[-- Type: text/x-diff, Size: 7214 bytes --]

From c1ab3dae7d4a1dc81b241e8402619be25b445c25 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Feb 2022 10:54:23 -0500
Subject: [PATCH 1/4] New package: python3-pytzdata-2020.1

---
 .../python3-pytzdata/patches/masonry.patch    | 12 ++++++++++++
 srcpkgs/python3-pytzdata/template             | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/python3-pytzdata/patches/masonry.patch
 create mode 100644 srcpkgs/python3-pytzdata/template

diff --git a/srcpkgs/python3-pytzdata/patches/masonry.patch b/srcpkgs/python3-pytzdata/patches/masonry.patch
new file mode 100644
index 000000000000..8226758d1f00
--- /dev/null
+++ b/srcpkgs/python3-pytzdata/patches/masonry.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 2b479bd..2e91506 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -30,5 +30,5 @@ black = {version = "^18.9b0", python = "^3.6"}
+ 
+ 
+ [build-system]
+-requires = ["poetry>=0.12"]
+-build-backend = "poetry.masonry.api"
++requires = ["poetry_core>=1.0.0"]
++build-backend = "poetry.core.masonry.api"
diff --git a/srcpkgs/python3-pytzdata/template b/srcpkgs/python3-pytzdata/template
new file mode 100644
index 000000000000..fe3984178117
--- /dev/null
+++ b/srcpkgs/python3-pytzdata/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytzdata'
+pkgname=python3-pytzdata
+version=2020.1
+revision=1
+wrksrc="pytzdata-${version}"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Olson timezone database for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/sdispater/pytzdata"
+distfiles="https://github.com/sdispater/pytzdata/archive/refs/tags/${version}.tar.gz"
+checksum=ffec92eb79bb2155862c9c3b80efb12a052182c197098501ec986d5ea1d178df
+
+post_install() {
+	vlicense LICENSE
+}

From 6209263034ae76eefccb1364504f30318c3e1764 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Feb 2022 09:41:12 -0500
Subject: [PATCH 2/4] New package: python3-pendulum-2.1.2

---
 srcpkgs/python3-pendulum/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-pendulum/template

diff --git a/srcpkgs/python3-pendulum/template b/srcpkgs/python3-pendulum/template
new file mode 100644
index 000000000000..09c9d405aae0
--- /dev/null
+++ b/srcpkgs/python3-pendulum/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pendulum'
+pkgname=python3-pendulum
+version=2.1.2
+revision=1
+wrksrc="pendulum-${version}"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-dateutil python3-pytzdata"
+checkdepends="python3-pytest python3-pytz python3-freezegun ${depends}"
+short_desc="Python datetimes made easy"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://pendulum.eustace.io"
+changelog="https://github.com/sdispater/pendulum/blob/master/CHANGELOG.md"
+distfiles="https://github.com/sdispater/pendulum/archive/refs/tags/${version}.tar.gz"
+checksum=4185efa48358cb9dca57a6afbc471d4b260e70f56609d5030197373564ac4a07
+
+post_install() {
+	vlicense LICENSE
+}

From e4775eb0a91c6b45de2ae27615e952f080f5e38f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Feb 2022 11:06:26 -0500
Subject: [PATCH 3/4] python3-cli_helpers: update to 2.2.1.

---
 .../patches/use-python3-mock-on-tests.patch        | 13 -------------
 srcpkgs/python3-cli_helpers/template               | 14 +++++---------
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch

diff --git a/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch b/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch
deleted file mode 100644
index 7af8c9d24022..000000000000
--- a/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git tests/test_config.py tests/test_config.py
-index 3cbe211..4d2bc77 100644
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -4,7 +4,7 @@
- from __future__ import unicode_literals
- import os
- 
--from mock import MagicMock
-+from unittest.mock import MagicMock
- import pytest
- 
- from cli_helpers.compat import MAC, text_type, WIN
diff --git a/srcpkgs/python3-cli_helpers/template b/srcpkgs/python3-cli_helpers/template
index a6b29fa02012..5bd32ced84ae 100644
--- a/srcpkgs/python3-cli_helpers/template
+++ b/srcpkgs/python3-cli_helpers/template
@@ -1,24 +1,20 @@
 # Template file for 'python3-cli_helpers'
 pkgname=python3-cli_helpers
-version=1.2.1
-revision=4
+version=2.2.1
+revision=1
 wrksrc="cli_helpers-${version}"
 build_style=python3-module
 pycompile_module="cli_helpers"
 hostmakedepends="python3-setuptools"
-depends="python3-configobj python3-tabulate python3-terminaltables
- python3-wcwidth"
+depends="python3-configobj python3-tabulate"
 checkdepends="python3-pytest ${depends}"
 short_desc="Python helpers for building command-line apps"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="BSD-3-Clause"
 homepage="https://github.com/dbcli/cli_helpers"
+changelog="https://raw.githubusercontent.com/dbcli/cli_helpers/main/CHANGELOG"
 distfiles="${PYPI_SITE}/c/cli_helpers/cli_helpers-${version}.tar.gz"
-checksum=98db22eaa86827d99ee6af9f5f3923142d04df256425204530842b032849a165
-
-do_check() {
-	python3 -m pytest
-}
+checksum=0ccc1cfcda1ac64dc7ed83d7013055cf19e5979d29e56c21f3b692de01555aae
 
 post_install() {
 	vlicense LICENSE

From ee62ce236c27de7ba00a381108f2fe6c2a3283f9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Feb 2022 09:14:55 -0500
Subject: [PATCH 4/4] pgcli: update to 3.4.0.

---
 srcpkgs/pgcli/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 29e4fb5fe0f5..0ff6f5079c4d 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,23 +1,20 @@
 # Template file for 'pgcli'
 pkgname=pgcli
-version=3.0.0
-revision=3
+version=3.4.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
- python3-psycopg2 python3-sqlparse python3-configobj python3-humanize
+ python3-psycopg2 python3-sqlparse python3-configobj python3-pendulum
  python3-cli_helpers python3-setproctitle"
 short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="BSD-3-Clause"
 homepage="https://www.pgcli.com"
+changelog="https://github.com/dbcli/pgcli/blob/main/changelog.rst"
 distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082
-
-do_check() {
-	# pgcli tests require a PostgreSQL server; skip them.
-	:
-}
+checksum=d566c6eda99aad1a27680bdfd74657e25bc0586d04eaf0b1626bb58bde75cfb6
+make_check=no # pgcli tests require a PostgreSQL server; skip them.
 
 post_install() {
 	vlicense LICENSE.txt

Re: [PR PATCH] [Updated] pgcli: update to 3.4.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 1229 bytes --]

There is an updated pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages pgcli
https://github.com/void-linux/void-packages/pull/35841

pgcli: update to 3.4.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35841.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pgcli-35841.patch --]
[-- Type: text/x-diff, Size: 7213 bytes --]

From c1ab3dae7d4a1dc81b241e8402619be25b445c25 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Feb 2022 10:54:23 -0500
Subject: [PATCH 1/4] New package: python3-pytzdata-2020.1

---
 .../python3-pytzdata/patches/masonry.patch    | 12 ++++++++++++
 srcpkgs/python3-pytzdata/template             | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/python3-pytzdata/patches/masonry.patch
 create mode 100644 srcpkgs/python3-pytzdata/template

diff --git a/srcpkgs/python3-pytzdata/patches/masonry.patch b/srcpkgs/python3-pytzdata/patches/masonry.patch
new file mode 100644
index 000000000000..8226758d1f00
--- /dev/null
+++ b/srcpkgs/python3-pytzdata/patches/masonry.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 2b479bd..2e91506 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -30,5 +30,5 @@ black = {version = "^18.9b0", python = "^3.6"}
+ 
+ 
+ [build-system]
+-requires = ["poetry>=0.12"]
+-build-backend = "poetry.masonry.api"
++requires = ["poetry_core>=1.0.0"]
++build-backend = "poetry.core.masonry.api"
diff --git a/srcpkgs/python3-pytzdata/template b/srcpkgs/python3-pytzdata/template
new file mode 100644
index 000000000000..fe3984178117
--- /dev/null
+++ b/srcpkgs/python3-pytzdata/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pytzdata'
+pkgname=python3-pytzdata
+version=2020.1
+revision=1
+wrksrc="pytzdata-${version}"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Olson timezone database for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/sdispater/pytzdata"
+distfiles="https://github.com/sdispater/pytzdata/archive/refs/tags/${version}.tar.gz"
+checksum=ffec92eb79bb2155862c9c3b80efb12a052182c197098501ec986d5ea1d178df
+
+post_install() {
+	vlicense LICENSE
+}

From 6209263034ae76eefccb1364504f30318c3e1764 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Feb 2022 09:41:12 -0500
Subject: [PATCH 2/4] New package: python3-pendulum-2.1.2

---
 srcpkgs/python3-pendulum/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-pendulum/template

diff --git a/srcpkgs/python3-pendulum/template b/srcpkgs/python3-pendulum/template
new file mode 100644
index 000000000000..09c9d405aae0
--- /dev/null
+++ b/srcpkgs/python3-pendulum/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-pendulum'
+pkgname=python3-pendulum
+version=2.1.2
+revision=1
+wrksrc="pendulum-${version}"
+build_style=python3-pep517
+hostmakedepends="python3-poetry-core"
+depends="python3-dateutil python3-pytzdata"
+checkdepends="python3-pytest python3-pytz python3-freezegun ${depends}"
+short_desc="Python datetimes made easy"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://pendulum.eustace.io"
+changelog="https://github.com/sdispater/pendulum/blob/master/CHANGELOG.md"
+distfiles="https://github.com/sdispater/pendulum/archive/refs/tags/${version}.tar.gz"
+checksum=4185efa48358cb9dca57a6afbc471d4b260e70f56609d5030197373564ac4a07
+
+post_install() {
+	vlicense LICENSE
+}

From 0e2ce736a44a8072b9c7cad490d4b6df38644775 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Feb 2022 11:06:26 -0500
Subject: [PATCH 3/4] python3-cli_helpers: update to 2.2.1.

---
 .../patches/use-python3-mock-on-tests.patch       | 13 -------------
 srcpkgs/python3-cli_helpers/template              | 15 +++++----------
 2 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch

diff --git a/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch b/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch
deleted file mode 100644
index 7af8c9d24022..000000000000
--- a/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git tests/test_config.py tests/test_config.py
-index 3cbe211..4d2bc77 100644
---- a/tests/test_config.py
-+++ b/tests/test_config.py
-@@ -4,7 +4,7 @@
- from __future__ import unicode_literals
- import os
- 
--from mock import MagicMock
-+from unittest.mock import MagicMock
- import pytest
- 
- from cli_helpers.compat import MAC, text_type, WIN
diff --git a/srcpkgs/python3-cli_helpers/template b/srcpkgs/python3-cli_helpers/template
index a6b29fa02012..aa084c626c76 100644
--- a/srcpkgs/python3-cli_helpers/template
+++ b/srcpkgs/python3-cli_helpers/template
@@ -1,24 +1,19 @@
 # Template file for 'python3-cli_helpers'
 pkgname=python3-cli_helpers
-version=1.2.1
-revision=4
+version=2.2.1
+revision=1
 wrksrc="cli_helpers-${version}"
 build_style=python3-module
-pycompile_module="cli_helpers"
 hostmakedepends="python3-setuptools"
-depends="python3-configobj python3-tabulate python3-terminaltables
- python3-wcwidth"
+depends="python3-configobj python3-tabulate"
 checkdepends="python3-pytest ${depends}"
 short_desc="Python helpers for building command-line apps"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="BSD-3-Clause"
 homepage="https://github.com/dbcli/cli_helpers"
+changelog="https://raw.githubusercontent.com/dbcli/cli_helpers/main/CHANGELOG"
 distfiles="${PYPI_SITE}/c/cli_helpers/cli_helpers-${version}.tar.gz"
-checksum=98db22eaa86827d99ee6af9f5f3923142d04df256425204530842b032849a165
-
-do_check() {
-	python3 -m pytest
-}
+checksum=0ccc1cfcda1ac64dc7ed83d7013055cf19e5979d29e56c21f3b692de01555aae
 
 post_install() {
 	vlicense LICENSE

From 14d4cda71bd21d993e7cbb47ac60683415ff9e15 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Feb 2022 09:14:55 -0500
Subject: [PATCH 4/4] pgcli: update to 3.4.0.

---
 srcpkgs/pgcli/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 29e4fb5fe0f5..0ff6f5079c4d 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,23 +1,20 @@
 # Template file for 'pgcli'
 pkgname=pgcli
-version=3.0.0
-revision=3
+version=3.4.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
- python3-psycopg2 python3-sqlparse python3-configobj python3-humanize
+ python3-psycopg2 python3-sqlparse python3-configobj python3-pendulum
  python3-cli_helpers python3-setproctitle"
 short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="BSD-3-Clause"
 homepage="https://www.pgcli.com"
+changelog="https://github.com/dbcli/pgcli/blob/main/changelog.rst"
 distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=4920225838e8004ae6d2ec42f566e0a8b99c4bd42bc2c876d0de8501da0a4082
-
-do_check() {
-	# pgcli tests require a PostgreSQL server; skip them.
-	:
-}
+checksum=d566c6eda99aad1a27680bdfd74657e25bc0586d04eaf0b1626bb58bde75cfb6
+make_check=no # pgcli tests require a PostgreSQL server; skip them.
 
 post_install() {
 	vlicense LICENSE.txt

Re: pgcli: update to 3.4.0.

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/35841#issuecomment-1057035971

Comment:
Any chance this can be merged? The current version is broken due to python3-cli_helpers having a broken usage of pygments.

Re: [PR PATCH] [Merged]: pgcli: update to 3.4.0.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]

There's a merged pull request on the void-packages repository

pgcli: update to 3.4.0.
https://github.com/void-linux/void-packages/pull/35841

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: pgcli: update to 3.4.0.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 284 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/35841#issuecomment-1057624281

Comment:
It kind of bugs me to see PEP517 proliferate, but that has nothing to do with this PR and is why we have that build style in the first place.