diff --git a/ilot/py3-scramp/APKBUILD b/ilot/py3-scramp/APKBUILD deleted file mode 100644 index 916b7a1..0000000 --- a/ilot/py3-scramp/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-scramp -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=scramp -pkgver=1.4.5 -pkgrel=0 -pkgdesc="Python implementation of the SCRAM protocol" -url="https://pypi.python.org/project/scramp" -arch="noarch" -license="MIT" -depends="py3-asn1crypto" -checkdepends="py3-pytest py3-passlib py3-pytest-mock" -makedepends="py3-setuptools py3-gpep517 py3-wheel py3-hatchling" -source="$pkgname-$pkgver.tar.gz::https://github.com/tlocke/scramp/archive/refs/tags/$pkgver.tar.gz" -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - echo "__version__ = \"$pkgver\"" > _version.py - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -v -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -070bf5b92f45bd506cb0f6aeb4ff7fccfff9092b69bed20338a2cfdf84f5587b9162fa1ffb84db8c98ea5f3e008f34db5848690d857110e1d037bb15d2a95d58 py3-scramp-1.4.5.tar.gz -" diff --git a/ilot/py3-scramp/use-local-version-src.patch b/ilot/py3-scramp/use-local-version-src.patch deleted file mode 100644 index 4ad0785..0000000 --- a/ilot/py3-scramp/use-local-version-src.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/pyproject.toml.orig b/pyproject.toml -index d79fac8..09bea8c 100644 ---- a/pyproject.toml.orig -+++ b/pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["hatchling", "versioningit"] -+requires = ["hatchling", "setuptools_scm"] - build-backend = "hatchling.build" - - [project] -@@ -30,18 +30,15 @@ dependencies = [ - ] - dynamic = ["version"] - -+[tool.setuptools_scm] -+write_to = "_version.py" -+ -+[tool.hatch.version] -+path = "_version.py" -+ - [project.urls] - Homepage = "https://github.com/tlocke/scramp" - --[tool.hatch.version] --source = "versioningit" -- --[tool.versioningit] -- --[tool.versioningit.vcs] --method = "git" --default-tag = "0.0.0" -- - [tool.flake8] - application-names = ["scramp"] - ignore = ["E203", "W503"] diff --git a/ilot/py3-testing-common-database/25_support-callable-in-collections.patch b/ilot/py3-testing-common-database/25_support-callable-in-collections.patch deleted file mode 100644 index de66056..0000000 --- a/ilot/py3-testing-common-database/25_support-callable-in-collections.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fa31191abe883d0ddc2a441550eeacc4126c85cb Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Sat, 18 Dec 2021 10:32:19 -0500 -Subject: [PATCH] Support Callable in collections.abc - -The abstract base classes are available here in Python 3.3+, and -in current Python versions they are no longer available directly -in collections. ---- - src/testing/common/database.py | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/testing/common/database.py b/src/testing/common/database.py -index 5ba8c5e..74e1067 100644 ---- a/src/testing/common/database.py -+++ b/src/testing/common/database.py -@@ -23,7 +23,10 @@ - from time import sleep - from shutil import copytree, rmtree - from datetime import datetime --import collections -+try: -+ from collections.abc import Callable -+except ImportError: -+ from collections import Callable - - - class DatabaseFactory(object): -@@ -285,7 +288,7 @@ def decorator(fn, path=arg): - - return skipIf(cond, "%s not found" % self.name)(fn) - -- if isinstance(arg, collections.Callable): # execute as simple decorator -+ if isinstance(arg, Callable): # execute as simple decorator - return decorator(arg, None) - else: # execute with path argument - return decorator diff --git a/ilot/py3-testing-common-database/APKBUILD b/ilot/py3-testing-common-database/APKBUILD deleted file mode 100644 index 8593440..0000000 --- a/ilot/py3-testing-common-database/APKBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-testing-common-database -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=testing.common.database -pkgver=2.0.3 -pkgrel=0 -pkgdesc="testing.common.database is utilities for testing.* package." -url="https://pypi.python.org/project/pyrad" -arch="noarch" -license="BSD-3-Clause" -depends="python3" -checkdepends="py3-unittest2" -makedepends="py3-setuptools py3-gpep517 py3-wheel" -source=" - $pkgname-$pkgver.tar.gz::https://github.com/tk0miya/testing.common.database/archive/refs/tags/$pkgver.tar.gz - 25_support-callable-in-collections.patch - " -options="!check" # No testsuite -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -d63df9a16ca518645f53516f4ab1c8e3bd539cd3d60471678c1b2dbe1b33a84587a93ae095bd0e46157581139921b3865b3ce5eb25efcefdf05cf65a6947f33c py3-testing-common-database-2.0.3.tar.gz -3ccb5977103d5703887cbddf58a70dfb262cc233c06e60b61178ca85fa69851fedc7c110141e3e98f838a38911fcf151b64e60224d9aff3ddf46849db4d81de3 25_support-callable-in-collections.patch -" diff --git a/ilot/py3-testing-postgresql/44_replace-assert-regeexp-matches.patch b/ilot/py3-testing-postgresql/44_replace-assert-regeexp-matches.patch deleted file mode 100644 index 82ad198..0000000 --- a/ilot/py3-testing-postgresql/44_replace-assert-regeexp-matches.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ec9ce743a0f51076d7ea2485a6fa58b72ec8e338 Mon Sep 17 00:00:00 2001 -From: "Benjamin A. Beasley" -Date: Fri, 4 Aug 2023 10:58:08 -0400 -Subject: [PATCH] Replace assertRegexpMatches() with assertRegex() - -This alias was deprecated in Python 3.2 and is removed in Python 3.12. - -Reference: https://docs.python.org/3.12/whatsnew/3.12.html ---- - tests/test_postgresql.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/test_postgresql.py b/tests/test_postgresql.py -index 1fa1116..b2bba20 100644 ---- a/tests/test_postgresql.py -+++ b/tests/test_postgresql.py -@@ -28,7 +28,7 @@ def test_basic(self): - # connect to postgresql (w/ psycopg2) - conn = psycopg2.connect(**pgsql.dsn()) - self.assertIsNotNone(conn) -- self.assertRegexpMatches(pgsql.read_bootlog(), 'is ready to accept connections') -+ self.assertRegex(pgsql.read_bootlog(), 'is ready to accept connections') - conn.close() - - # connect to postgresql (w/ sqlalchemy) -@@ -38,7 +38,7 @@ def test_basic(self): - # connect to postgresql (w/ pg8000) - conn = pg8000.connect(**pgsql.dsn()) - self.assertIsNotNone(conn) -- self.assertRegexpMatches(pgsql.read_bootlog(), 'is ready to accept connections') -+ self.assertRegex(pgsql.read_bootlog(), 'is ready to accept connections') - conn.close() - finally: - # shutting down diff --git a/ilot/py3-testing-postgresql/APKBUILD b/ilot/py3-testing-postgresql/APKBUILD deleted file mode 100644 index 05a0f0f..0000000 --- a/ilot/py3-testing-postgresql/APKBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Contributor: Antoine Martin (ayakael) -# Maintainer: Antoine Martin (ayakael) -pkgname=py3-testing-postgresql -#_pkgreal is used by apkbuild-pypi to find modules at PyPI -_pkgreal=testing.postgresql -pkgver=1.3.0 -pkgrel=0 -pkgdesc="Automatically setups a postgresql instance in a temporary directory, and destroys it after testing" -url="https://pypi.python.org/project/testing.postgresql" -arch="noarch" -license="Apache-2.0" -depends="py3-testing-common-database py3-pg8000 postgresql" -checkdepends="py3-pytest py3-psycopg2 py3-sqlalchemy" -makedepends="py3-setuptools py3-gpep517 py3-wheel" -source=" - $pkgname-$pkgver.tar.gz::https://github.com/tk0miya/testing.postgresql/archive/refs/tags/$pkgver.tar.gz - 44_replace-assert-regeexp-matches.patch - " -builddir="$srcdir/$_pkgreal-$pkgver" -subpackages="$pkgname-pyc" - -build() { - gpep517 build-wheel \ - --wheel-dir .dist \ - --output-fd 3 3>&1 >&2 -} - -check() { - python3 -m venv --clear --without-pip --system-site-packages .testenv - .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -v -} - -package() { - python3 -m installer -d "$pkgdir" \ - .dist/*.whl -} - -sha512sums=" -7b907e4c11c67eb6a2e936e6b96fb90747dfe14d92b8864a3951071701da8888e583deec7d05d4c0bd145f4d7b03bd71434c2111116eccd9a001466021433720 py3-testing-postgresql-1.3.0.tar.gz -42a51e77c20daa98f981b58ae9c8efd422dda2d04e53497df61a4e500a2aff4fc6c58c5f298c796b5f8f180ec7625561373991eee0433b11a88c874775469d5a 44_replace-assert-regeexp-matches.patch -"