* [PR PATCH] python3-pydantic: update to 2.4.2.
@ 2023-10-25 12:15 TinfoilSubmarine
2024-01-24 1:47 ` github-actions
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: TinfoilSubmarine @ 2023-10-25 12:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1379 bytes --]
There is a new pull request by TinfoilSubmarine against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/python3-pydantic
https://github.com/void-linux/void-packages/pull/46889
python3-pydantic: update to 2.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Need to test these packages depending on python3-pydantic:
- [ ] python3-inflect
- [x] synapse
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/46889.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/python3-pydantic-46889.patch --]
[-- Type: text/x-diff, Size: 13066 bytes --]
From 78aa0f47ecc5663dec0642197257b10306712016 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:41:12 -0400
Subject: [PATCH 1/7] New package: python3-dirty-equals-0.6.0
---
.../patches/no-pytest-filterwarnings.patch | 12 +++++++++++
srcpkgs/python3-dirty-equals/template | 21 +++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
create mode 100644 srcpkgs/python3-dirty-equals/template
diff --git a/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
new file mode 100644
index 0000000000000..e9ff2cc4a4cb2
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 1b8ff7a..3a753ac 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -59,7 +59,6 @@ target-version = 'py37'
+
+ [tool.pytest.ini_options]
+ testpaths = "tests"
+-filterwarnings = "error"
+
+ [tool.coverage.run]
+ source = ["dirty_equals"]
diff --git a/srcpkgs/python3-dirty-equals/template b/srcpkgs/python3-dirty-equals/template
new file mode 100644
index 0000000000000..4e0be610d2621
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-dirty-equals'
+pkgname=python3-dirty-equals
+version=0.6.0
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples and circular dependency on pydantic
+make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_other.py"
+hostmakedepends="hatchling"
+depends="python3-pytz"
+checkdepends="${depends} python3-pytest"
+short_desc="Doing dirty (but extremely useful) things with equals"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/samuelcolvin/dirty-equals"
+changelog="https://github.com/samuelcolvin/dirty-equals/releases"
+distfiles="${PYPI_SITE}/d/dirty_equals/dirty_equals-${version}.tar.gz"
+checksum=4c4e4b9b52670ad8b880c46734e5ffc52e023250ae817398b78b30e329c3955d
+
+post_install() {
+ vlicense LICENSE
+}
From cdc11c9d6acf942bc4e03ff6ecbcb476d06cce95 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:42:50 -0400
Subject: [PATCH 2/7] New package: python3-pydantic-core-2.11.0
---
srcpkgs/python3-pydantic-core/template | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/python3-pydantic-core/template
diff --git a/srcpkgs/python3-pydantic-core/template b/srcpkgs/python3-pydantic-core/template
new file mode 100644
index 0000000000000..e345f6a6ed168
--- /dev/null
+++ b/srcpkgs/python3-pydantic-core/template
@@ -0,0 +1,36 @@
+# Template file for 'python3-pydantic-core'
+pkgname=python3-pydantic-core
+version=2.11.0
+revision=1
+build_style=python3-pep517
+build_helper=rust
+hostmakedepends="maturin cargo"
+makedepends="python3-typing_extensions"
+depends="python3-typing_extensions"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-timeout python3-pytest-mock python3-hypothesis
+ python3-dirty-equals"
+short_desc="Core functionality for pydantic-core validation and serialization"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/pydantic/pydantic-core"
+distfiles="${PYPI_SITE}/p/pydantic_core/pydantic_core-${version}.tar.gz"
+checksum=55c6d7fdc94a98e0551870774e27be1ec5cd847230015463853d27a73b05ba13
+
+# taken from python3-adblock
+if [ "$CROSS_BUILD" ]; then
+ makedepends+=" rust-std"
+ hostmakedepends+=" python3-typing_extensions"
+ export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+ export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_build() {
+ maturin build -o . --release --target "${RUST_TARGET}" --manylinux off
+ mkdir -p dist
+ mv pydantic_core-${version}-*.whl dist/pydantic_core-${version}-py3-none-any.whl
+}
+
+post_install() {
+ vlicense LICENSE
+}
From ee00fa5fe4d9a88a8c7162456766f086febae151 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:14:36 -0400
Subject: [PATCH 3/7] New package: python3-annotated-types-0.6.0
---
srcpkgs/python3-annotated-types/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-annotated-types/template
diff --git a/srcpkgs/python3-annotated-types/template b/srcpkgs/python3-annotated-types/template
new file mode 100644
index 0000000000000..ca3900a990430
--- /dev/null
+++ b/srcpkgs/python3-annotated-types/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-annotated-types'
+pkgname=python3-annotated-types
+version=0.6.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Reusable constraint types to use with typing.Annotated"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/annotated-types/annotated-types"
+distfiles="${PYPI_SITE}/a/annotated_types/annotated_types-${version}.tar.gz"
+checksum=563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d
+
+post_install() {
+ vlicense LICENSE
+}
From ad4c5ee01449f291a02064ea89b6c52a4b05b820 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 19 Oct 2023 08:28:34 -0400
Subject: [PATCH 4/7] python3-email-validator: update to 2.0.0.
---
srcpkgs/python3-email-validator/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-email-validator/template b/srcpkgs/python3-email-validator/template
index 69628ad1e35db..9534a0c875b59 100644
--- a/srcpkgs/python3-email-validator/template
+++ b/srcpkgs/python3-email-validator/template
@@ -1,20 +1,19 @@
# Template file for 'python3-email-validator'
pkgname=python3-email-validator
-version=1.3.0
-revision=3
+version=2.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3"
depends="python3-idna python3-dnspython"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest $depends"
short_desc="Robust email address syntax and deliverability validation library"
maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
license="CC0-1.0"
homepage="https://github.com/JoshData/python-email-validator"
changelog="https://raw.githubusercontent.com/JoshData/python-email-validator/main/CHANGELOG.md"
distfiles="https://github.com/JoshData/python-email-validator/archive/refs/tags/v${version}.tar.gz"
-checksum=1f5b38b5f6b8455468f2c557e887c442d455931ee1523c6eb40c6f7ce119d99b
-make_check=no #no tests folder is present in archives
+checksum=0cd656b4c2cba10bcb518808f800bdde74af0c01a2522a9d475b3b1954d98f01
post_install() {
vlicense LICENSE
From fbd54ecfb0a81a533949b853312573efa6ec4649 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 19 Oct 2023 08:37:46 -0400
Subject: [PATCH 5/7] python3-Faker: update to 19.12.0.
---
srcpkgs/python3-Faker/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-Faker/template b/srcpkgs/python3-Faker/template
index 8e8533c703913..9576ad17fd606 100644
--- a/srcpkgs/python3-Faker/template
+++ b/srcpkgs/python3-Faker/template
@@ -1,6 +1,6 @@
# Template file for 'python3-Faker'
pkgname=python3-Faker
-version=19.9.0
+version=19.12.0
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://faker.readthedocs.io/en/master/"
changelog="https://github.com/joke2k/faker/raw/master/CHANGELOG.md"
distfiles="${PYPI_SITE}/F/Faker/Faker-${version}.tar.gz"
-checksum=d75401c631a991b32d3595f26250f42c007cc32653ac3e522b626f3d80770571
+checksum=91438f6b1713274ec3f24970ba303617be86ce5caf6f6a0776f1d04777b6ff5f
post_install() {
vlicense LICENSE.txt
From f688a213d35503fc27125a3e8fc069d0b7cc352f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:47:01 -0400
Subject: [PATCH 6/7] python3-pydantic: update to 2.4.2.
---
.../patches/drop-fancy-pypi-readme-dep.patch | 38 +++++++++++++++++++
srcpkgs/python3-pydantic/template | 20 +++++-----
2 files changed, 49 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
diff --git a/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
new file mode 100644
index 0000000000000..6bc5bcf6f3321
--- /dev/null
+++ b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
@@ -0,0 +1,38 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index aba4d03..d2af96e 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ['hatchling', 'hatch-fancy-pypi-readme>=22.5.0']
++requires = ['hatchling']
+ build-backend = 'hatchling.build'
+
+ [tool.hatch.version]
+diff --git a/pyproject.toml b/pyproject.toml
+index d2af96e..5ccd6f6 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -128,22 +128,6 @@ Funding = 'https://github.com/sponsors/samuelcolvin'
+ Source = 'https://github.com/pydantic/pydantic'
+ Changelog = 'https://docs.pydantic.dev/latest/changelog/'
+
+-[tool.hatch.metadata.hooks.fancy-pypi-readme]
+-content-type = 'text/markdown'
+-# construct the PyPI readme from README.md and HISTORY.md
+-fragments = [
+- {path = "README.md"},
+- {text = "\n## Changelog\n\n"},
+- {path = "HISTORY.md", pattern = "(.+?)<!-- package description limit -->"},
+- {text = "\n... see [here](https://docs.pydantic.dev/changelog/#v0322-2019-08-17) for earlier changes.\n"},
+-]
+-# convert GitHuB issue/PR numbers and handles to links
+-substitutions = [
+- {pattern = '(\s+)#(\d+)', replacement = '\1[#\2](https://github.com/pydantic/pydantic/issues/\2)'},
+- {pattern = '(\s+)@([\w\-]+)', replacement = '\1[@\2](https://github.com/\2)'},
+- {pattern = '@@', replacement = '@'},
+-]
+-
+ [tool.pytest.ini_options]
+ testpaths = 'tests'
+ xfail_strict = true
diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template
index 8a09f0e39bc1f..17333449bf64e 100644
--- a/srcpkgs/python3-pydantic/template
+++ b/srcpkgs/python3-pydantic/template
@@ -1,20 +1,22 @@
# Template file for 'python3-pydantic'
pkgname=python3-pydantic
-version=1.10.7
-revision=2
-build_style=python3-module
-# added to stop test failing due to DeprecationWarning on pkg_resources import
-make_check_args="-p no:warnings"
-hostmakedepends="python3-setuptools"
-depends="python3-typing_extensions"
-checkdepends="${depends} python3-pytest python3-pytest-mock"
+version=2.4.2
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples
+make_check_args="--ignore=tests/test_docs.py"
+hostmakedepends="hatchling"
+depends="python3-typing_extensions python3-annotated-types
+ python3-pydantic-core"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-mock python3-dirty-equals python3-Faker python3-email-validator"
short_desc="Data parsing and validation using Python type hints"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="MIT"
homepage="https://github.com/pydantic/pydantic"
changelog="https://raw.githubusercontent.com/pydantic/pydantic/main/HISTORY.md"
distfiles="${PYPI_SITE}/p/pydantic/pydantic-${version}.tar.gz"
-checksum=cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e
+checksum=94f336138093a5d7f426aac732dcfe7ab4eb4da243c88f891d65deb4a2556ee7
post_install() {
vlicense LICENSE
From df1bbbcfde72476e42d0bd9f1b1fc97a7087b556 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 17:05:27 -0400
Subject: [PATCH 7/7] python3-inflect: update to 7.0.0.
---
srcpkgs/python3-inflect/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-inflect/template b/srcpkgs/python3-inflect/template
index 15b16a0da04bd..e83b21c359d04 100644
--- a/srcpkgs/python3-inflect/template
+++ b/srcpkgs/python3-inflect/template
@@ -1,7 +1,7 @@
# Template file for 'python3-inflect'
pkgname=python3-inflect
-version=6.0.4
-revision=2
+version=7.0.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
depends="python3-pydantic"
@@ -10,9 +10,10 @@ short_desc="Correctly generate plurals, ordinals; convert numbers to words"
maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jaraco/inflect"
-changelog="https://raw.githubusercontent.com/jaraco/inflect/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/jaraco/inflect/main/NEWS.rst"
distfiles="${PYPI_SITE}/i/inflect/inflect-${version}.tar.gz"
-checksum=1842649a17b6cad66812a5c9bdfacb6310e1e7b6dd8a31f026766df1b62612eb
+checksum=63da9325ad29da81ec23e055b41225795ab793b4ecb483be5dc1fa363fd4717e
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: python3-pydantic: update to 2.4.2.
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
@ 2024-01-24 1:47 ` github-actions
2024-02-08 1:44 ` [PR PATCH] [Closed]: " github-actions
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2024-01-24 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/46889#issuecomment-1907213572
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: python3-pydantic: update to 2.4.2.
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
2024-01-24 1:47 ` github-actions
@ 2024-02-08 1:44 ` github-actions
2024-03-05 7:41 ` [PR PATCH] [Updated] " classabbyamp
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: github-actions @ 2024-02-08 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There's a closed pull request on the void-packages repository
python3-pydantic: update to 2.4.2.
https://github.com/void-linux/void-packages/pull/46889
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Need to test these packages depending on python3-pydantic:
- [ ] python3-inflect (needed bump to latest to support pydantic 2)
- [x] synapse
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] python3-pydantic: update to 2.4.2.
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
2024-01-24 1:47 ` github-actions
2024-02-08 1:44 ` [PR PATCH] [Closed]: " github-actions
@ 2024-03-05 7:41 ` classabbyamp
2024-03-05 7:55 ` classabbyamp
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2024-03-05 7:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/python3-pydantic
https://github.com/void-linux/void-packages/pull/46889
python3-pydantic: update to 2.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Need to test these packages depending on python3-pydantic:
- [ ] python3-inflect (needed bump to latest to support pydantic 2)
- [x] synapse
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/46889.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/python3-pydantic-46889.patch --]
[-- Type: text/x-diff, Size: 11996 bytes --]
From 3bc68105e3359694fb7333dc04fb861fc3293e0a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:41:12 -0400
Subject: [PATCH 1/6] New package: python3-dirty-equals-0.6.0
---
.../patches/no-pytest-filterwarnings.patch | 12 +++++++++++
srcpkgs/python3-dirty-equals/template | 21 +++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
create mode 100644 srcpkgs/python3-dirty-equals/template
diff --git a/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
new file mode 100644
index 00000000000000..e9ff2cc4a4cb25
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 1b8ff7a..3a753ac 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -59,7 +59,6 @@ target-version = 'py37'
+
+ [tool.pytest.ini_options]
+ testpaths = "tests"
+-filterwarnings = "error"
+
+ [tool.coverage.run]
+ source = ["dirty_equals"]
diff --git a/srcpkgs/python3-dirty-equals/template b/srcpkgs/python3-dirty-equals/template
new file mode 100644
index 00000000000000..4e0be610d26219
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-dirty-equals'
+pkgname=python3-dirty-equals
+version=0.6.0
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples and circular dependency on pydantic
+make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_other.py"
+hostmakedepends="hatchling"
+depends="python3-pytz"
+checkdepends="${depends} python3-pytest"
+short_desc="Doing dirty (but extremely useful) things with equals"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/samuelcolvin/dirty-equals"
+changelog="https://github.com/samuelcolvin/dirty-equals/releases"
+distfiles="${PYPI_SITE}/d/dirty_equals/dirty_equals-${version}.tar.gz"
+checksum=4c4e4b9b52670ad8b880c46734e5ffc52e023250ae817398b78b30e329c3955d
+
+post_install() {
+ vlicense LICENSE
+}
From 4c86e68c768cc13d807c05cb3ab56bf36c133fb3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:42:50 -0400
Subject: [PATCH 2/6] New package: python3-pydantic-core-2.11.0
---
srcpkgs/python3-pydantic-core/template | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/python3-pydantic-core/template
diff --git a/srcpkgs/python3-pydantic-core/template b/srcpkgs/python3-pydantic-core/template
new file mode 100644
index 00000000000000..e345f6a6ed1685
--- /dev/null
+++ b/srcpkgs/python3-pydantic-core/template
@@ -0,0 +1,36 @@
+# Template file for 'python3-pydantic-core'
+pkgname=python3-pydantic-core
+version=2.11.0
+revision=1
+build_style=python3-pep517
+build_helper=rust
+hostmakedepends="maturin cargo"
+makedepends="python3-typing_extensions"
+depends="python3-typing_extensions"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-timeout python3-pytest-mock python3-hypothesis
+ python3-dirty-equals"
+short_desc="Core functionality for pydantic-core validation and serialization"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/pydantic/pydantic-core"
+distfiles="${PYPI_SITE}/p/pydantic_core/pydantic_core-${version}.tar.gz"
+checksum=55c6d7fdc94a98e0551870774e27be1ec5cd847230015463853d27a73b05ba13
+
+# taken from python3-adblock
+if [ "$CROSS_BUILD" ]; then
+ makedepends+=" rust-std"
+ hostmakedepends+=" python3-typing_extensions"
+ export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+ export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_build() {
+ maturin build -o . --release --target "${RUST_TARGET}" --manylinux off
+ mkdir -p dist
+ mv pydantic_core-${version}-*.whl dist/pydantic_core-${version}-py3-none-any.whl
+}
+
+post_install() {
+ vlicense LICENSE
+}
From c7f1df8eaff0d040639124e95d3512b1a3103ed3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:14:36 -0400
Subject: [PATCH 3/6] New package: python3-annotated-types-0.6.0
---
srcpkgs/python3-annotated-types/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-annotated-types/template
diff --git a/srcpkgs/python3-annotated-types/template b/srcpkgs/python3-annotated-types/template
new file mode 100644
index 00000000000000..ca3900a9904302
--- /dev/null
+++ b/srcpkgs/python3-annotated-types/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-annotated-types'
+pkgname=python3-annotated-types
+version=0.6.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Reusable constraint types to use with typing.Annotated"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/annotated-types/annotated-types"
+distfiles="${PYPI_SITE}/a/annotated_types/annotated_types-${version}.tar.gz"
+checksum=563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d
+
+post_install() {
+ vlicense LICENSE
+}
From 45bffb1b6393b768b83a00e63c50ca7f4cb249d9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 19 Oct 2023 08:28:34 -0400
Subject: [PATCH 4/6] python3-email-validator: update to 2.0.0.
---
srcpkgs/python3-email-validator/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-email-validator/template b/srcpkgs/python3-email-validator/template
index 69628ad1e35dbd..9534a0c875b591 100644
--- a/srcpkgs/python3-email-validator/template
+++ b/srcpkgs/python3-email-validator/template
@@ -1,20 +1,19 @@
# Template file for 'python3-email-validator'
pkgname=python3-email-validator
-version=1.3.0
-revision=3
+version=2.0.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3"
depends="python3-idna python3-dnspython"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest $depends"
short_desc="Robust email address syntax and deliverability validation library"
maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
license="CC0-1.0"
homepage="https://github.com/JoshData/python-email-validator"
changelog="https://raw.githubusercontent.com/JoshData/python-email-validator/main/CHANGELOG.md"
distfiles="https://github.com/JoshData/python-email-validator/archive/refs/tags/v${version}.tar.gz"
-checksum=1f5b38b5f6b8455468f2c557e887c442d455931ee1523c6eb40c6f7ce119d99b
-make_check=no #no tests folder is present in archives
+checksum=0cd656b4c2cba10bcb518808f800bdde74af0c01a2522a9d475b3b1954d98f01
post_install() {
vlicense LICENSE
From e965c5e0afd544673e24a8450adc15736371ccb9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:47:01 -0400
Subject: [PATCH 5/6] python3-pydantic: update to 2.4.2.
---
.../patches/drop-fancy-pypi-readme-dep.patch | 38 +++++++++++++++++++
srcpkgs/python3-pydantic/template | 20 +++++-----
2 files changed, 49 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
diff --git a/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
new file mode 100644
index 00000000000000..6bc5bcf6f33211
--- /dev/null
+++ b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
@@ -0,0 +1,38 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index aba4d03..d2af96e 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ['hatchling', 'hatch-fancy-pypi-readme>=22.5.0']
++requires = ['hatchling']
+ build-backend = 'hatchling.build'
+
+ [tool.hatch.version]
+diff --git a/pyproject.toml b/pyproject.toml
+index d2af96e..5ccd6f6 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -128,22 +128,6 @@ Funding = 'https://github.com/sponsors/samuelcolvin'
+ Source = 'https://github.com/pydantic/pydantic'
+ Changelog = 'https://docs.pydantic.dev/latest/changelog/'
+
+-[tool.hatch.metadata.hooks.fancy-pypi-readme]
+-content-type = 'text/markdown'
+-# construct the PyPI readme from README.md and HISTORY.md
+-fragments = [
+- {path = "README.md"},
+- {text = "\n## Changelog\n\n"},
+- {path = "HISTORY.md", pattern = "(.+?)<!-- package description limit -->"},
+- {text = "\n... see [here](https://docs.pydantic.dev/changelog/#v0322-2019-08-17) for earlier changes.\n"},
+-]
+-# convert GitHuB issue/PR numbers and handles to links
+-substitutions = [
+- {pattern = '(\s+)#(\d+)', replacement = '\1[#\2](https://github.com/pydantic/pydantic/issues/\2)'},
+- {pattern = '(\s+)@([\w\-]+)', replacement = '\1[@\2](https://github.com/\2)'},
+- {pattern = '@@', replacement = '@'},
+-]
+-
+ [tool.pytest.ini_options]
+ testpaths = 'tests'
+ xfail_strict = true
diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template
index 8a09f0e39bc1f4..17333449bf64e4 100644
--- a/srcpkgs/python3-pydantic/template
+++ b/srcpkgs/python3-pydantic/template
@@ -1,20 +1,22 @@
# Template file for 'python3-pydantic'
pkgname=python3-pydantic
-version=1.10.7
-revision=2
-build_style=python3-module
-# added to stop test failing due to DeprecationWarning on pkg_resources import
-make_check_args="-p no:warnings"
-hostmakedepends="python3-setuptools"
-depends="python3-typing_extensions"
-checkdepends="${depends} python3-pytest python3-pytest-mock"
+version=2.4.2
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples
+make_check_args="--ignore=tests/test_docs.py"
+hostmakedepends="hatchling"
+depends="python3-typing_extensions python3-annotated-types
+ python3-pydantic-core"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-mock python3-dirty-equals python3-Faker python3-email-validator"
short_desc="Data parsing and validation using Python type hints"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="MIT"
homepage="https://github.com/pydantic/pydantic"
changelog="https://raw.githubusercontent.com/pydantic/pydantic/main/HISTORY.md"
distfiles="${PYPI_SITE}/p/pydantic/pydantic-${version}.tar.gz"
-checksum=cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e
+checksum=94f336138093a5d7f426aac732dcfe7ab4eb4da243c88f891d65deb4a2556ee7
post_install() {
vlicense LICENSE
From f4300e964384876cdf79a1b47a63ce8e98c6d85a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 17:05:27 -0400
Subject: [PATCH 6/6] python3-inflect: update to 7.0.0.
---
srcpkgs/python3-inflect/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-inflect/template b/srcpkgs/python3-inflect/template
index 15b16a0da04bd2..e83b21c359d04a 100644
--- a/srcpkgs/python3-inflect/template
+++ b/srcpkgs/python3-inflect/template
@@ -1,7 +1,7 @@
# Template file for 'python3-inflect'
pkgname=python3-inflect
-version=6.0.4
-revision=2
+version=7.0.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
depends="python3-pydantic"
@@ -10,9 +10,10 @@ short_desc="Correctly generate plurals, ordinals; convert numbers to words"
maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jaraco/inflect"
-changelog="https://raw.githubusercontent.com/jaraco/inflect/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/jaraco/inflect/main/NEWS.rst"
distfiles="${PYPI_SITE}/i/inflect/inflect-${version}.tar.gz"
-checksum=1842649a17b6cad66812a5c9bdfacb6310e1e7b6dd8a31f026766df1b62612eb
+checksum=63da9325ad29da81ec23e055b41225795ab793b4ecb483be5dc1fa363fd4717e
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] python3-pydantic: update to 2.4.2.
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
` (2 preceding siblings ...)
2024-03-05 7:41 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-03-05 7:55 ` classabbyamp
2024-03-05 8:07 ` classabbyamp
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2024-03-05 7:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/python3-pydantic
https://github.com/void-linux/void-packages/pull/46889
python3-pydantic: update to 2.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Need to test these packages depending on python3-pydantic:
- [ ] python3-inflect (needed bump to latest to support pydantic 2)
- [x] synapse
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/46889.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/python3-pydantic-46889.patch --]
[-- Type: text/x-diff, Size: 12294 bytes --]
From 22772d12452152ad5d3437d93375c8f12fe004b0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:41:12 -0400
Subject: [PATCH 1/6] New package: python3-dirty-equals-0.7.1
---
.../patches/no-pytest-filterwarnings.patch | 12 +++++++++++
srcpkgs/python3-dirty-equals/template | 21 +++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
create mode 100644 srcpkgs/python3-dirty-equals/template
diff --git a/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
new file mode 100644
index 00000000000000..e9ff2cc4a4cb25
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 1b8ff7a..3a753ac 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -59,7 +59,6 @@ target-version = 'py37'
+
+ [tool.pytest.ini_options]
+ testpaths = "tests"
+-filterwarnings = "error"
+
+ [tool.coverage.run]
+ source = ["dirty_equals"]
diff --git a/srcpkgs/python3-dirty-equals/template b/srcpkgs/python3-dirty-equals/template
new file mode 100644
index 00000000000000..55b6835e143c74
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-dirty-equals'
+pkgname=python3-dirty-equals
+version=0.7.1
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples and circular dependency on pydantic
+make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_other.py"
+hostmakedepends="hatchling"
+depends="python3-pytz"
+checkdepends="${depends} python3-pytest"
+short_desc="Doing dirty (but extremely useful) things with equals"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/samuelcolvin/dirty-equals"
+changelog="https://github.com/samuelcolvin/dirty-equals/releases"
+distfiles="${PYPI_SITE}/d/dirty_equals/dirty_equals-${version}.tar.gz"
+checksum=a580513f3285e93656a770a04e428f8bfc513848877bf278282dbfbb907fdbb4
+
+post_install() {
+ vlicense LICENSE
+}
From edd387f1a85b34a90462c1288af8baebba60bfc6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:42:50 -0400
Subject: [PATCH 2/6] New package: python3-pydantic-core-2.16.3
---
srcpkgs/python3-pydantic-core/template | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/python3-pydantic-core/template
diff --git a/srcpkgs/python3-pydantic-core/template b/srcpkgs/python3-pydantic-core/template
new file mode 100644
index 00000000000000..b9f180ef23b042
--- /dev/null
+++ b/srcpkgs/python3-pydantic-core/template
@@ -0,0 +1,36 @@
+# Template file for 'python3-pydantic-core'
+pkgname=python3-pydantic-core
+version=2.16.3
+revision=1
+build_style=python3-pep517
+build_helper=rust
+hostmakedepends="maturin cargo"
+makedepends="python3-typing_extensions"
+depends="python3-typing_extensions"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-timeout python3-pytest-mock python3-hypothesis
+ python3-dirty-equals"
+short_desc="Core functionality for pydantic-core validation and serialization"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/pydantic/pydantic-core"
+distfiles="${PYPI_SITE}/p/pydantic_core/pydantic_core-${version}.tar.gz"
+checksum=1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad
+
+# taken from python3-adblock
+if [ "$CROSS_BUILD" ]; then
+ makedepends+=" rust-std"
+ hostmakedepends+=" python3-typing_extensions"
+ export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+ export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_build() {
+ maturin build -o . --release --target "${RUST_TARGET}" --manylinux off
+ mkdir -p dist
+ mv pydantic_core-${version}-*.whl dist/pydantic_core-${version}-py3-none-any.whl
+}
+
+post_install() {
+ vlicense LICENSE
+}
From cdddddc3393eabfeecbaeef3f6a35ac14a29815b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:14:36 -0400
Subject: [PATCH 3/6] New package: python3-annotated-types-0.6.0
---
srcpkgs/python3-annotated-types/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-annotated-types/template
diff --git a/srcpkgs/python3-annotated-types/template b/srcpkgs/python3-annotated-types/template
new file mode 100644
index 00000000000000..ca3900a9904302
--- /dev/null
+++ b/srcpkgs/python3-annotated-types/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-annotated-types'
+pkgname=python3-annotated-types
+version=0.6.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Reusable constraint types to use with typing.Annotated"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/annotated-types/annotated-types"
+distfiles="${PYPI_SITE}/a/annotated_types/annotated_types-${version}.tar.gz"
+checksum=563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d
+
+post_install() {
+ vlicense LICENSE
+}
From e95d414cdcf116a0657dc011b44380295a44cdac Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 19 Oct 2023 08:28:34 -0400
Subject: [PATCH 4/6] python3-email-validator: update to 2.1.1.
---
srcpkgs/python3-email-validator/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-email-validator/template b/srcpkgs/python3-email-validator/template
index 69628ad1e35dbd..fd3bd87bb52db1 100644
--- a/srcpkgs/python3-email-validator/template
+++ b/srcpkgs/python3-email-validator/template
@@ -1,20 +1,19 @@
# Template file for 'python3-email-validator'
pkgname=python3-email-validator
-version=1.3.0
-revision=3
+version=2.1.1
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3"
depends="python3-idna python3-dnspython"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest $depends"
short_desc="Robust email address syntax and deliverability validation library"
maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
license="CC0-1.0"
homepage="https://github.com/JoshData/python-email-validator"
changelog="https://raw.githubusercontent.com/JoshData/python-email-validator/main/CHANGELOG.md"
distfiles="https://github.com/JoshData/python-email-validator/archive/refs/tags/v${version}.tar.gz"
-checksum=1f5b38b5f6b8455468f2c557e887c442d455931ee1523c6eb40c6f7ce119d99b
-make_check=no #no tests folder is present in archives
+checksum=051fdaf98263be9afa52dcd50b6bc591708654b6b598b47e4a4080205a717fc1
post_install() {
vlicense LICENSE
From 5ecbc32259ae16f601d716424a0ebb65b6361e55 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:47:01 -0400
Subject: [PATCH 5/6] python3-pydantic: update to 2.6.3.
---
.../patches/drop-fancy-pypi-readme-dep.patch | 38 +++++++++++++++++++
srcpkgs/python3-pydantic/template | 20 +++++-----
srcpkgs/python3-pydantic/update | 2 +-
3 files changed, 50 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
diff --git a/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
new file mode 100644
index 00000000000000..6bc5bcf6f33211
--- /dev/null
+++ b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
@@ -0,0 +1,38 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index aba4d03..d2af96e 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ['hatchling', 'hatch-fancy-pypi-readme>=22.5.0']
++requires = ['hatchling']
+ build-backend = 'hatchling.build'
+
+ [tool.hatch.version]
+diff --git a/pyproject.toml b/pyproject.toml
+index d2af96e..5ccd6f6 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -128,22 +128,6 @@ Funding = 'https://github.com/sponsors/samuelcolvin'
+ Source = 'https://github.com/pydantic/pydantic'
+ Changelog = 'https://docs.pydantic.dev/latest/changelog/'
+
+-[tool.hatch.metadata.hooks.fancy-pypi-readme]
+-content-type = 'text/markdown'
+-# construct the PyPI readme from README.md and HISTORY.md
+-fragments = [
+- {path = "README.md"},
+- {text = "\n## Changelog\n\n"},
+- {path = "HISTORY.md", pattern = "(.+?)<!-- package description limit -->"},
+- {text = "\n... see [here](https://docs.pydantic.dev/changelog/#v0322-2019-08-17) for earlier changes.\n"},
+-]
+-# convert GitHuB issue/PR numbers and handles to links
+-substitutions = [
+- {pattern = '(\s+)#(\d+)', replacement = '\1[#\2](https://github.com/pydantic/pydantic/issues/\2)'},
+- {pattern = '(\s+)@([\w\-]+)', replacement = '\1[@\2](https://github.com/\2)'},
+- {pattern = '@@', replacement = '@'},
+-]
+-
+ [tool.pytest.ini_options]
+ testpaths = 'tests'
+ xfail_strict = true
diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template
index 8a09f0e39bc1f4..4ab0e8760705a3 100644
--- a/srcpkgs/python3-pydantic/template
+++ b/srcpkgs/python3-pydantic/template
@@ -1,20 +1,22 @@
# Template file for 'python3-pydantic'
pkgname=python3-pydantic
-version=1.10.7
-revision=2
-build_style=python3-module
-# added to stop test failing due to DeprecationWarning on pkg_resources import
-make_check_args="-p no:warnings"
-hostmakedepends="python3-setuptools"
-depends="python3-typing_extensions"
-checkdepends="${depends} python3-pytest python3-pytest-mock"
+version=2.6.3
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples
+make_check_args="--ignore=tests/test_docs.py"
+hostmakedepends="hatchling"
+depends="python3-typing_extensions python3-annotated-types
+ python3-pydantic-core"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-mock python3-dirty-equals python3-Faker python3-email-validator"
short_desc="Data parsing and validation using Python type hints"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="MIT"
homepage="https://github.com/pydantic/pydantic"
changelog="https://raw.githubusercontent.com/pydantic/pydantic/main/HISTORY.md"
distfiles="${PYPI_SITE}/p/pydantic/pydantic-${version}.tar.gz"
-checksum=cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e
+checksum=e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-pydantic/update b/srcpkgs/python3-pydantic/update
index 2c857beffb293e..225af1026a1db5 100644
--- a/srcpkgs/python3-pydantic/update
+++ b/srcpkgs/python3-pydantic/update
@@ -1 +1 @@
-ignore="*a*"
+ignore="*[ab]*"
From f7431e5019200d8ac0363eaebaf92ba752aec809 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 17:05:27 -0400
Subject: [PATCH 6/6] python3-inflect: update to 7.0.0.
---
srcpkgs/python3-inflect/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-inflect/template b/srcpkgs/python3-inflect/template
index 15b16a0da04bd2..e83b21c359d04a 100644
--- a/srcpkgs/python3-inflect/template
+++ b/srcpkgs/python3-inflect/template
@@ -1,7 +1,7 @@
# Template file for 'python3-inflect'
pkgname=python3-inflect
-version=6.0.4
-revision=2
+version=7.0.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
depends="python3-pydantic"
@@ -10,9 +10,10 @@ short_desc="Correctly generate plurals, ordinals; convert numbers to words"
maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jaraco/inflect"
-changelog="https://raw.githubusercontent.com/jaraco/inflect/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/jaraco/inflect/main/NEWS.rst"
distfiles="${PYPI_SITE}/i/inflect/inflect-${version}.tar.gz"
-checksum=1842649a17b6cad66812a5c9bdfacb6310e1e7b6dd8a31f026766df1b62612eb
+checksum=63da9325ad29da81ec23e055b41225795ab793b4ecb483be5dc1fa363fd4717e
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] python3-pydantic: update to 2.4.2.
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
` (3 preceding siblings ...)
2024-03-05 7:55 ` classabbyamp
@ 2024-03-05 8:07 ` classabbyamp
2024-03-05 8:21 ` classabbyamp
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2024-03-05 8:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/python3-pydantic
https://github.com/void-linux/void-packages/pull/46889
python3-pydantic: update to 2.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Need to test these packages depending on python3-pydantic:
- [ ] python3-inflect (needed bump to latest to support pydantic 2)
- [x] synapse
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/46889.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/python3-pydantic-46889.patch --]
[-- Type: text/x-diff, Size: 12337 bytes --]
From 22772d12452152ad5d3437d93375c8f12fe004b0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:41:12 -0400
Subject: [PATCH 1/6] New package: python3-dirty-equals-0.7.1
---
.../patches/no-pytest-filterwarnings.patch | 12 +++++++++++
srcpkgs/python3-dirty-equals/template | 21 +++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
create mode 100644 srcpkgs/python3-dirty-equals/template
diff --git a/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
new file mode 100644
index 00000000000000..e9ff2cc4a4cb25
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 1b8ff7a..3a753ac 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -59,7 +59,6 @@ target-version = 'py37'
+
+ [tool.pytest.ini_options]
+ testpaths = "tests"
+-filterwarnings = "error"
+
+ [tool.coverage.run]
+ source = ["dirty_equals"]
diff --git a/srcpkgs/python3-dirty-equals/template b/srcpkgs/python3-dirty-equals/template
new file mode 100644
index 00000000000000..55b6835e143c74
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-dirty-equals'
+pkgname=python3-dirty-equals
+version=0.7.1
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples and circular dependency on pydantic
+make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_other.py"
+hostmakedepends="hatchling"
+depends="python3-pytz"
+checkdepends="${depends} python3-pytest"
+short_desc="Doing dirty (but extremely useful) things with equals"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/samuelcolvin/dirty-equals"
+changelog="https://github.com/samuelcolvin/dirty-equals/releases"
+distfiles="${PYPI_SITE}/d/dirty_equals/dirty_equals-${version}.tar.gz"
+checksum=a580513f3285e93656a770a04e428f8bfc513848877bf278282dbfbb907fdbb4
+
+post_install() {
+ vlicense LICENSE
+}
From edd387f1a85b34a90462c1288af8baebba60bfc6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:42:50 -0400
Subject: [PATCH 2/6] New package: python3-pydantic-core-2.16.3
---
srcpkgs/python3-pydantic-core/template | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/python3-pydantic-core/template
diff --git a/srcpkgs/python3-pydantic-core/template b/srcpkgs/python3-pydantic-core/template
new file mode 100644
index 00000000000000..b9f180ef23b042
--- /dev/null
+++ b/srcpkgs/python3-pydantic-core/template
@@ -0,0 +1,36 @@
+# Template file for 'python3-pydantic-core'
+pkgname=python3-pydantic-core
+version=2.16.3
+revision=1
+build_style=python3-pep517
+build_helper=rust
+hostmakedepends="maturin cargo"
+makedepends="python3-typing_extensions"
+depends="python3-typing_extensions"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-timeout python3-pytest-mock python3-hypothesis
+ python3-dirty-equals"
+short_desc="Core functionality for pydantic-core validation and serialization"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/pydantic/pydantic-core"
+distfiles="${PYPI_SITE}/p/pydantic_core/pydantic_core-${version}.tar.gz"
+checksum=1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad
+
+# taken from python3-adblock
+if [ "$CROSS_BUILD" ]; then
+ makedepends+=" rust-std"
+ hostmakedepends+=" python3-typing_extensions"
+ export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+ export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_build() {
+ maturin build -o . --release --target "${RUST_TARGET}" --manylinux off
+ mkdir -p dist
+ mv pydantic_core-${version}-*.whl dist/pydantic_core-${version}-py3-none-any.whl
+}
+
+post_install() {
+ vlicense LICENSE
+}
From cdddddc3393eabfeecbaeef3f6a35ac14a29815b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:14:36 -0400
Subject: [PATCH 3/6] New package: python3-annotated-types-0.6.0
---
srcpkgs/python3-annotated-types/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-annotated-types/template
diff --git a/srcpkgs/python3-annotated-types/template b/srcpkgs/python3-annotated-types/template
new file mode 100644
index 00000000000000..ca3900a9904302
--- /dev/null
+++ b/srcpkgs/python3-annotated-types/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-annotated-types'
+pkgname=python3-annotated-types
+version=0.6.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Reusable constraint types to use with typing.Annotated"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/annotated-types/annotated-types"
+distfiles="${PYPI_SITE}/a/annotated_types/annotated_types-${version}.tar.gz"
+checksum=563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d
+
+post_install() {
+ vlicense LICENSE
+}
From e95d414cdcf116a0657dc011b44380295a44cdac Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 19 Oct 2023 08:28:34 -0400
Subject: [PATCH 4/6] python3-email-validator: update to 2.1.1.
---
srcpkgs/python3-email-validator/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-email-validator/template b/srcpkgs/python3-email-validator/template
index 69628ad1e35dbd..fd3bd87bb52db1 100644
--- a/srcpkgs/python3-email-validator/template
+++ b/srcpkgs/python3-email-validator/template
@@ -1,20 +1,19 @@
# Template file for 'python3-email-validator'
pkgname=python3-email-validator
-version=1.3.0
-revision=3
+version=2.1.1
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3"
depends="python3-idna python3-dnspython"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest $depends"
short_desc="Robust email address syntax and deliverability validation library"
maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
license="CC0-1.0"
homepage="https://github.com/JoshData/python-email-validator"
changelog="https://raw.githubusercontent.com/JoshData/python-email-validator/main/CHANGELOG.md"
distfiles="https://github.com/JoshData/python-email-validator/archive/refs/tags/v${version}.tar.gz"
-checksum=1f5b38b5f6b8455468f2c557e887c442d455931ee1523c6eb40c6f7ce119d99b
-make_check=no #no tests folder is present in archives
+checksum=051fdaf98263be9afa52dcd50b6bc591708654b6b598b47e4a4080205a717fc1
post_install() {
vlicense LICENSE
From a6f3982a99fa2de494ee82adc839d4d3930c31f1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:47:01 -0400
Subject: [PATCH 5/6] python3-pydantic: update to 2.6.3.
---
.../patches/drop-fancy-pypi-readme-dep.patch | 38 +++++++++++++++++++
srcpkgs/python3-pydantic/template | 20 +++++-----
srcpkgs/python3-pydantic/update | 2 +-
3 files changed, 50 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
diff --git a/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
new file mode 100644
index 00000000000000..6bc5bcf6f33211
--- /dev/null
+++ b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
@@ -0,0 +1,38 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index aba4d03..d2af96e 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ['hatchling', 'hatch-fancy-pypi-readme>=22.5.0']
++requires = ['hatchling']
+ build-backend = 'hatchling.build'
+
+ [tool.hatch.version]
+diff --git a/pyproject.toml b/pyproject.toml
+index d2af96e..5ccd6f6 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -128,22 +128,6 @@ Funding = 'https://github.com/sponsors/samuelcolvin'
+ Source = 'https://github.com/pydantic/pydantic'
+ Changelog = 'https://docs.pydantic.dev/latest/changelog/'
+
+-[tool.hatch.metadata.hooks.fancy-pypi-readme]
+-content-type = 'text/markdown'
+-# construct the PyPI readme from README.md and HISTORY.md
+-fragments = [
+- {path = "README.md"},
+- {text = "\n## Changelog\n\n"},
+- {path = "HISTORY.md", pattern = "(.+?)<!-- package description limit -->"},
+- {text = "\n... see [here](https://docs.pydantic.dev/changelog/#v0322-2019-08-17) for earlier changes.\n"},
+-]
+-# convert GitHuB issue/PR numbers and handles to links
+-substitutions = [
+- {pattern = '(\s+)#(\d+)', replacement = '\1[#\2](https://github.com/pydantic/pydantic/issues/\2)'},
+- {pattern = '(\s+)@([\w\-]+)', replacement = '\1[@\2](https://github.com/\2)'},
+- {pattern = '@@', replacement = '@'},
+-]
+-
+ [tool.pytest.ini_options]
+ testpaths = 'tests'
+ xfail_strict = true
diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template
index 8a09f0e39bc1f4..70c647c424bac6 100644
--- a/srcpkgs/python3-pydantic/template
+++ b/srcpkgs/python3-pydantic/template
@@ -1,20 +1,22 @@
# Template file for 'python3-pydantic'
pkgname=python3-pydantic
-version=1.10.7
-revision=2
-build_style=python3-module
-# added to stop test failing due to DeprecationWarning on pkg_resources import
-make_check_args="-p no:warnings"
-hostmakedepends="python3-setuptools"
-depends="python3-typing_extensions"
-checkdepends="${depends} python3-pytest python3-pytest-mock"
+version=2.6.3
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples, cloudpickle
+make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_pickle.py"
+hostmakedepends="hatchling"
+depends="python3-typing_extensions python3-annotated-types
+ python3-pydantic-core"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-mock python3-dirty-equals python3-Faker python3-email-validator"
short_desc="Data parsing and validation using Python type hints"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="MIT"
homepage="https://github.com/pydantic/pydantic"
changelog="https://raw.githubusercontent.com/pydantic/pydantic/main/HISTORY.md"
distfiles="${PYPI_SITE}/p/pydantic/pydantic-${version}.tar.gz"
-checksum=cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e
+checksum=e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-pydantic/update b/srcpkgs/python3-pydantic/update
index 2c857beffb293e..225af1026a1db5 100644
--- a/srcpkgs/python3-pydantic/update
+++ b/srcpkgs/python3-pydantic/update
@@ -1 +1 @@
-ignore="*a*"
+ignore="*[ab]*"
From f9741354dfc71c03484e17a8da3f3818ce92df46 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 17:05:27 -0400
Subject: [PATCH 6/6] python3-inflect: update to 7.0.0.
---
srcpkgs/python3-inflect/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-inflect/template b/srcpkgs/python3-inflect/template
index 15b16a0da04bd2..e83b21c359d04a 100644
--- a/srcpkgs/python3-inflect/template
+++ b/srcpkgs/python3-inflect/template
@@ -1,7 +1,7 @@
# Template file for 'python3-inflect'
pkgname=python3-inflect
-version=6.0.4
-revision=2
+version=7.0.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
depends="python3-pydantic"
@@ -10,9 +10,10 @@ short_desc="Correctly generate plurals, ordinals; convert numbers to words"
maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jaraco/inflect"
-changelog="https://raw.githubusercontent.com/jaraco/inflect/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/jaraco/inflect/main/NEWS.rst"
distfiles="${PYPI_SITE}/i/inflect/inflect-${version}.tar.gz"
-checksum=1842649a17b6cad66812a5c9bdfacb6310e1e7b6dd8a31f026766df1b62612eb
+checksum=63da9325ad29da81ec23e055b41225795ab793b4ecb483be5dc1fa363fd4717e
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] python3-pydantic: update to 2.4.2.
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
` (4 preceding siblings ...)
2024-03-05 8:07 ` classabbyamp
@ 2024-03-05 8:21 ` classabbyamp
2024-03-05 8:22 ` classabbyamp
2024-03-05 8:31 ` [PR PATCH] [Merged]: " classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2024-03-05 8:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1426 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/TinfoilSubmarine/void-packages maint/python3-pydantic
https://github.com/void-linux/void-packages/pull/46889
python3-pydantic: update to 2.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Need to test these packages depending on python3-pydantic:
- [ ] python3-inflect (needed bump to latest to support pydantic 2)
- [x] synapse
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/46889.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-maint/python3-pydantic-46889.patch --]
[-- Type: text/x-diff, Size: 13875 bytes --]
From 22772d12452152ad5d3437d93375c8f12fe004b0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:41:12 -0400
Subject: [PATCH 1/6] New package: python3-dirty-equals-0.7.1
---
.../patches/no-pytest-filterwarnings.patch | 12 +++++++++++
srcpkgs/python3-dirty-equals/template | 21 +++++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
create mode 100644 srcpkgs/python3-dirty-equals/template
diff --git a/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
new file mode 100644
index 00000000000000..e9ff2cc4a4cb25
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/patches/no-pytest-filterwarnings.patch
@@ -0,0 +1,12 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 1b8ff7a..3a753ac 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -59,7 +59,6 @@ target-version = 'py37'
+
+ [tool.pytest.ini_options]
+ testpaths = "tests"
+-filterwarnings = "error"
+
+ [tool.coverage.run]
+ source = ["dirty_equals"]
diff --git a/srcpkgs/python3-dirty-equals/template b/srcpkgs/python3-dirty-equals/template
new file mode 100644
index 00000000000000..55b6835e143c74
--- /dev/null
+++ b/srcpkgs/python3-dirty-equals/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-dirty-equals'
+pkgname=python3-dirty-equals
+version=0.7.1
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples and circular dependency on pydantic
+make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_other.py"
+hostmakedepends="hatchling"
+depends="python3-pytz"
+checkdepends="${depends} python3-pytest"
+short_desc="Doing dirty (but extremely useful) things with equals"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/samuelcolvin/dirty-equals"
+changelog="https://github.com/samuelcolvin/dirty-equals/releases"
+distfiles="${PYPI_SITE}/d/dirty_equals/dirty_equals-${version}.tar.gz"
+checksum=a580513f3285e93656a770a04e428f8bfc513848877bf278282dbfbb907fdbb4
+
+post_install() {
+ vlicense LICENSE
+}
From edd387f1a85b34a90462c1288af8baebba60bfc6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:42:50 -0400
Subject: [PATCH 2/6] New package: python3-pydantic-core-2.16.3
---
srcpkgs/python3-pydantic-core/template | 36 ++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/python3-pydantic-core/template
diff --git a/srcpkgs/python3-pydantic-core/template b/srcpkgs/python3-pydantic-core/template
new file mode 100644
index 00000000000000..b9f180ef23b042
--- /dev/null
+++ b/srcpkgs/python3-pydantic-core/template
@@ -0,0 +1,36 @@
+# Template file for 'python3-pydantic-core'
+pkgname=python3-pydantic-core
+version=2.16.3
+revision=1
+build_style=python3-pep517
+build_helper=rust
+hostmakedepends="maturin cargo"
+makedepends="python3-typing_extensions"
+depends="python3-typing_extensions"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-timeout python3-pytest-mock python3-hypothesis
+ python3-dirty-equals"
+short_desc="Core functionality for pydantic-core validation and serialization"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/pydantic/pydantic-core"
+distfiles="${PYPI_SITE}/p/pydantic_core/pydantic_core-${version}.tar.gz"
+checksum=1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad
+
+# taken from python3-adblock
+if [ "$CROSS_BUILD" ]; then
+ makedepends+=" rust-std"
+ hostmakedepends+=" python3-typing_extensions"
+ export PYO3_CROSS_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib"
+ export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
+fi
+
+do_build() {
+ maturin build -o . --release --target "${RUST_TARGET}" --manylinux off
+ mkdir -p dist
+ mv pydantic_core-${version}-*.whl dist/pydantic_core-${version}-py3-none-any.whl
+}
+
+post_install() {
+ vlicense LICENSE
+}
From cdddddc3393eabfeecbaeef3f6a35ac14a29815b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:14:36 -0400
Subject: [PATCH 3/6] New package: python3-annotated-types-0.6.0
---
srcpkgs/python3-annotated-types/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-annotated-types/template
diff --git a/srcpkgs/python3-annotated-types/template b/srcpkgs/python3-annotated-types/template
new file mode 100644
index 00000000000000..ca3900a9904302
--- /dev/null
+++ b/srcpkgs/python3-annotated-types/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-annotated-types'
+pkgname=python3-annotated-types
+version=0.6.0
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Reusable constraint types to use with typing.Annotated"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/annotated-types/annotated-types"
+distfiles="${PYPI_SITE}/a/annotated_types/annotated_types-${version}.tar.gz"
+checksum=563339e807e53ffd9c267e99fc6d9ea23eb8443c08f112651963e24e22f84a5d
+
+post_install() {
+ vlicense LICENSE
+}
From e95d414cdcf116a0657dc011b44380295a44cdac Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 19 Oct 2023 08:28:34 -0400
Subject: [PATCH 4/6] python3-email-validator: update to 2.1.1.
---
srcpkgs/python3-email-validator/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-email-validator/template b/srcpkgs/python3-email-validator/template
index 69628ad1e35dbd..fd3bd87bb52db1 100644
--- a/srcpkgs/python3-email-validator/template
+++ b/srcpkgs/python3-email-validator/template
@@ -1,20 +1,19 @@
# Template file for 'python3-email-validator'
pkgname=python3-email-validator
-version=1.3.0
-revision=3
+version=2.1.1
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
makedepends="python3"
depends="python3-idna python3-dnspython"
-checkdepends="python3-pytest"
+checkdepends="python3-pytest $depends"
short_desc="Robust email address syntax and deliverability validation library"
maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
license="CC0-1.0"
homepage="https://github.com/JoshData/python-email-validator"
changelog="https://raw.githubusercontent.com/JoshData/python-email-validator/main/CHANGELOG.md"
distfiles="https://github.com/JoshData/python-email-validator/archive/refs/tags/v${version}.tar.gz"
-checksum=1f5b38b5f6b8455468f2c557e887c442d455931ee1523c6eb40c6f7ce119d99b
-make_check=no #no tests folder is present in archives
+checksum=051fdaf98263be9afa52dcd50b6bc591708654b6b598b47e4a4080205a717fc1
post_install() {
vlicense LICENSE
From a6f3982a99fa2de494ee82adc839d4d3930c31f1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 16:47:01 -0400
Subject: [PATCH 5/6] python3-pydantic: update to 2.6.3.
---
.../patches/drop-fancy-pypi-readme-dep.patch | 38 +++++++++++++++++++
srcpkgs/python3-pydantic/template | 20 +++++-----
srcpkgs/python3-pydantic/update | 2 +-
3 files changed, 50 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
diff --git a/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
new file mode 100644
index 00000000000000..6bc5bcf6f33211
--- /dev/null
+++ b/srcpkgs/python3-pydantic/patches/drop-fancy-pypi-readme-dep.patch
@@ -0,0 +1,38 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index aba4d03..d2af96e 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ['hatchling', 'hatch-fancy-pypi-readme>=22.5.0']
++requires = ['hatchling']
+ build-backend = 'hatchling.build'
+
+ [tool.hatch.version]
+diff --git a/pyproject.toml b/pyproject.toml
+index d2af96e..5ccd6f6 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -128,22 +128,6 @@ Funding = 'https://github.com/sponsors/samuelcolvin'
+ Source = 'https://github.com/pydantic/pydantic'
+ Changelog = 'https://docs.pydantic.dev/latest/changelog/'
+
+-[tool.hatch.metadata.hooks.fancy-pypi-readme]
+-content-type = 'text/markdown'
+-# construct the PyPI readme from README.md and HISTORY.md
+-fragments = [
+- {path = "README.md"},
+- {text = "\n## Changelog\n\n"},
+- {path = "HISTORY.md", pattern = "(.+?)<!-- package description limit -->"},
+- {text = "\n... see [here](https://docs.pydantic.dev/changelog/#v0322-2019-08-17) for earlier changes.\n"},
+-]
+-# convert GitHuB issue/PR numbers and handles to links
+-substitutions = [
+- {pattern = '(\s+)#(\d+)', replacement = '\1[#\2](https://github.com/pydantic/pydantic/issues/\2)'},
+- {pattern = '(\s+)@([\w\-]+)', replacement = '\1[@\2](https://github.com/\2)'},
+- {pattern = '@@', replacement = '@'},
+-]
+-
+ [tool.pytest.ini_options]
+ testpaths = 'tests'
+ xfail_strict = true
diff --git a/srcpkgs/python3-pydantic/template b/srcpkgs/python3-pydantic/template
index 8a09f0e39bc1f4..70c647c424bac6 100644
--- a/srcpkgs/python3-pydantic/template
+++ b/srcpkgs/python3-pydantic/template
@@ -1,20 +1,22 @@
# Template file for 'python3-pydantic'
pkgname=python3-pydantic
-version=1.10.7
-revision=2
-build_style=python3-module
-# added to stop test failing due to DeprecationWarning on pkg_resources import
-make_check_args="-p no:warnings"
-hostmakedepends="python3-setuptools"
-depends="python3-typing_extensions"
-checkdepends="${depends} python3-pytest python3-pytest-mock"
+version=2.6.3
+revision=1
+build_style=python3-pep517
+# requires unpackaged pytest-examples, cloudpickle
+make_check_args="--ignore=tests/test_docs.py --ignore=tests/test_pickle.py"
+hostmakedepends="hatchling"
+depends="python3-typing_extensions python3-annotated-types
+ python3-pydantic-core"
+checkdepends="${depends} python3-pytest python3-pytest-benchmark
+ python3-pytest-mock python3-dirty-equals python3-Faker python3-email-validator"
short_desc="Data parsing and validation using Python type hints"
maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
license="MIT"
homepage="https://github.com/pydantic/pydantic"
changelog="https://raw.githubusercontent.com/pydantic/pydantic/main/HISTORY.md"
distfiles="${PYPI_SITE}/p/pydantic/pydantic-${version}.tar.gz"
-checksum=cfc83c0678b6ba51b0532bea66860617c4cd4251ecf76e9846fa5a9f3454e97e
+checksum=e07805c4c7f5c6826e33a1d4c9d47950d7eaf34868e2690f8594d2e30241f11f
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-pydantic/update b/srcpkgs/python3-pydantic/update
index 2c857beffb293e..225af1026a1db5 100644
--- a/srcpkgs/python3-pydantic/update
+++ b/srcpkgs/python3-pydantic/update
@@ -1 +1 @@
-ignore="*a*"
+ignore="*[ab]*"
From 817cc418491df31ca45174590404654de565958a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 22 Aug 2023 17:05:27 -0400
Subject: [PATCH 6/6] python3-inflect: update to 7.0.0.
---
.../python3-inflect/patches/fix-test.patch | 28 +++++++++++++++++++
srcpkgs/python3-inflect/template | 9 +++---
2 files changed, 33 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/python3-inflect/patches/fix-test.patch
diff --git a/srcpkgs/python3-inflect/patches/fix-test.patch b/srcpkgs/python3-inflect/patches/fix-test.patch
new file mode 100644
index 00000000000000..45770502cc3e6c
--- /dev/null
+++ b/srcpkgs/python3-inflect/patches/fix-test.patch
@@ -0,0 +1,28 @@
+From f6177e1b30c7cda6e73b6a0aa7437fe5a16fd0aa Mon Sep 17 00:00:00 2001
+From: Jaremy Hatler <hatler.jaremy@gmail.com>
+Date: Sat, 23 Dec 2023 21:37:41 -0500
+Subject: [PATCH] fix: compare validation now expects singular noun
+
+On pydantic-code >= 2.12, the validation error messages use the singular
+of the word "character" when the number 1 is specified in a condition.
+This breaks the engine.compare validation, which expected the plural.
+
+Refs: #204
+Signed-off-by: Jaremy Hatler <hatler.jaremy@gmail.com>
+---
+ inflect/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inflect/__init__.py b/inflect/__init__.py
+index ccef776..fcb3d01 100644
+--- a/inflect/__init__.py
++++ b/inflect/__init__.py
+@@ -2466,7 +2466,7 @@ def compare(self, word1: Word, word2: Word) -> Union[str, bool]:
+ ...
+ pydantic...ValidationError: ...
+ ...
+- ...at least 1 characters...
++ ...at least 1 character...
+ """
+ norms = self.plural_noun, self.plural_verb, self.plural_adj
+ results = (self._plequal(word1, word2, norm) for norm in norms)
diff --git a/srcpkgs/python3-inflect/template b/srcpkgs/python3-inflect/template
index 15b16a0da04bd2..e83b21c359d04a 100644
--- a/srcpkgs/python3-inflect/template
+++ b/srcpkgs/python3-inflect/template
@@ -1,7 +1,7 @@
# Template file for 'python3-inflect'
pkgname=python3-inflect
-version=6.0.4
-revision=2
+version=7.0.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-wheel python3-setuptools_scm"
depends="python3-pydantic"
@@ -10,9 +10,10 @@ short_desc="Correctly generate plurals, ordinals; convert numbers to words"
maintainer="icp <pangolin@vivaldi.net>"
license="MIT"
homepage="https://github.com/jaraco/inflect"
-changelog="https://raw.githubusercontent.com/jaraco/inflect/main/CHANGES.rst"
+changelog="https://raw.githubusercontent.com/jaraco/inflect/main/NEWS.rst"
distfiles="${PYPI_SITE}/i/inflect/inflect-${version}.tar.gz"
-checksum=1842649a17b6cad66812a5c9bdfacb6310e1e7b6dd8a31f026766df1b62612eb
+checksum=63da9325ad29da81ec23e055b41225795ab793b4ecb483be5dc1fa363fd4717e
+make_check_pre="env PY_IGNORE_IMPORTMISMATCH=1"
post_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: python3-pydantic: update to 2.4.2.
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
` (5 preceding siblings ...)
2024-03-05 8:21 ` classabbyamp
@ 2024-03-05 8:22 ` classabbyamp
2024-03-05 8:31 ` [PR PATCH] [Merged]: " classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2024-03-05 8:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/46889#issuecomment-1978196440
Comment:
sorry for letting this get stale-closed and for all the noise i'm making in your notifications
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: python3-pydantic: update to 2.4.2.
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
` (6 preceding siblings ...)
2024-03-05 8:22 ` classabbyamp
@ 2024-03-05 8:31 ` classabbyamp
7 siblings, 0 replies; 9+ messages in thread
From: classabbyamp @ 2024-03-05 8:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There's a merged pull request on the void-packages repository
python3-pydantic: update to 2.4.2.
https://github.com/void-linux/void-packages/pull/46889
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Need to test these packages depending on python3-pydantic:
- [x] python3-inflect (needed bump to latest to support pydantic 2)
- [x] synapse
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-03-05 8:31 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-25 12:15 [PR PATCH] python3-pydantic: update to 2.4.2 TinfoilSubmarine
2024-01-24 1:47 ` github-actions
2024-02-08 1:44 ` [PR PATCH] [Closed]: " github-actions
2024-03-05 7:41 ` [PR PATCH] [Updated] " classabbyamp
2024-03-05 7:55 ` classabbyamp
2024-03-05 8:07 ` classabbyamp
2024-03-05 8:21 ` classabbyamp
2024-03-05 8:22 ` classabbyamp
2024-03-05 8:31 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).