From 3bc68105e3359694fb7333dc04fb861fc3293e0a Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer 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 " +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 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 " +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 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 " +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 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 " 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 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 = "(.+?)"}, +- {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 " 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 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 " 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