~dricottone/huttese-apk

01f47675269a364fe80701a6e2787557d44019c5 — Dominic Ricottone 2 years ago d51c495
Revert update on ansi2html, atpublic, pygments

py3-ansi2html and py3-atpublic updates will only build on Alpine 3.16
which isn't yet the targetted version.

py3-pygments still needs to be held back for strange makedependency
incompatibility. Unsure if this will be solved by bumping Alpine
version.

Also, the dropping of py3-pgpy was greatly exaggerated. py3-srht still
depends on it. Maybe it will be dropped in a future update, hard to say.
5 files changed, 23 insertions(+), 134 deletions(-)

M Makefile
M pkgsrc/py3-ansi2html/APKBUILD
M pkgsrc/py3-atpublic/APKBUILD
D pkgsrc/py3-atpublic/pyproject.toml
M pkgsrc/py3-pygments/APKBUILD
M Makefile => Makefile +6 -6
@@ 26,7 26,7 @@ PY3_AMQP=pkg/aarch64/py3-amqp-5.1.1-r0.apk
$(PY3_AMQP): pkgsrc/py3-amqp/APKBUILD $(PY3_VINE)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-amqp

PY3_ANSI2HTML=pkg/aarch64/py3-ansi2html-1.8.0-r0.apk
PY3_ANSI2HTML=pkg/aarch64/py3-ansi2html-1.7.0-r0.apk
$(PY3_ANSI2HTML): pkgsrc/py3-ansi2html/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-ansi2html



@@ 34,7 34,7 @@ $(PY3_ANSI2HTML): pkgsrc/py3-ansi2html/APKBUILD
#$(PY3_ANYJSON): pkgsrc/py3-anyjson/APKBUILD
#	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-anyjson

PY3_ATPUBLIC=pkg/aarch64/py3-atpublic-3.1.1-r0.apk
PY3_ATPUBLIC=pkg/aarch64/py3-atpublic-2.3.r2.apk
$(PY3_ATPUBLIC): pkgsrc/py3-atpublic/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-atpublic



@@ 94,11 94,11 @@ PY3_ORDEREDMULTIDICT=pkg/aarch64/py3-orderedmultidict-1.0.1-r0.apk
$(PY3_ORDEREDMULTIDICT): pkgsrc/py3-orderedmultidict/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-orderedmultidict

#PY3_PGPY=pkg/aarch64/py3-pgpy-0.5.4-r1.apk
#$(PY3_PGPY): pkgsrc/py3-pgpy/APKBUILD
#	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-pgpy
PY3_PGPY=pkg/aarch64/py3-pgpy-0.5.4-r1.apk
$(PY3_PGPY): pkgsrc/py3-pgpy/APKBUILD
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-pgpy

PY3_PYGMENTS=pkg/aarch64/py3-pygments-2.13.0-r0.apk
PY3_PYGMENTS=pkg/aarch64/py3-pygments-2.11.2-r2.apk
$(PY3_PYGMENTS): pkgsrc/py3-pygments/APKBUILD $(PY3_WCAG_CONTRAST_RATIO)
	podman run --rm --mount type=bind,src=/var/deploy/build/huttese-apk/pkg,target=/home/builder/packages/huttese-pkgsrc,Z builder py3-pygments


M pkgsrc/py3-ansi2html/APKBUILD => pkgsrc/py3-ansi2html/APKBUILD +5 -7
@@ 2,14 2,14 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=py3-ansi2html
_pyname=ansi2html
pkgver=1.8.0
pkgver=1.7.0
pkgrel=0
pkgdesc="Convert text with ANSI color codes to HTML"
url="http://github.com/ralphbean/ansi2html/"
arch="noarch"
license="LGPL-3.0-or-later"
depends="py3-six"
makedepends="py3-setuptools_scm py3-setuptools-scm-git-archive py3-wheel py3-installer py3-build"
makedepends="py3-setuptools py3-setuptools_scm py3-toml pyproject2setuppy"
checkdepends="py3-pytest py3-mock py3-nose"
replaces="py-ansi2html py2-ansi2html"
_pypiprefix="${_pyname%${_pyname#?}}"


@@ 18,8 18,7 @@ builddir="$srcdir"/$_pyname-$pkgver
options="!check" # Upstream tests are stupid

build() {
	export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
	python3 -m build --no-isolation --wheel .
	python3 -m pyproject2setuppy.main build
}

check() {


@@ 27,10 26,9 @@ check() {
}

package() {
	python3 -m installer --destdir="$pkgdir" \
		dist/ansi2html-$pkgver-py3-none-any.whl
	python3 -m pyproject2setuppy.main install --prefix=/usr --root="$pkgdir"
}

sha512sums="
cbdda41f206ced5b19761a1ff9747acc6cadca3a5a2f58c97c6073db7d517e59fea7601bba28a8e7e105f3c0c9c4d78ca4f242100cbded6c8a9ca2d598de0ab4  ansi2html-1.8.0.tar.gz
bcae0de9874899bd8440853b8279f3b2c4ed46e24bf807221ddc9d1bfa39647e2efd178aefc2fd39bad27b53890270b6ff7c150a0b8e74581b8323ef7a16c977  ansi2html-1.7.0.tar.gz
"

M pkgsrc/py3-atpublic/APKBUILD => pkgsrc/py3-atpublic/APKBUILD +9 -21
@@ 2,43 2,31 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=py3-atpublic
_pyname=atpublic
pkgver=3.1.1
pkgrel=0
pkgver=2.3
pkgrel=2
pkgdesc="@public for populating __all__"
url="https://gitlab.com/warsaw/public"
arch="noarch"
license="Apache-2.0"
makedepends="python3-dev py3-setuptools py3-build py3-installer py3-wheel py3-toml"
checkdepends="py3-sybil py3-pytest py3-pytest-cov"
makedepends="python3-dev py3-setuptools py3-pytest"
checkdepends="py3-sybil py3-pytest-cov"
_pypiprefix="${_pyname%${_pyname#?}}"
source="
	https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz
	pyproject.toml
"
source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$pkgver.tar.gz"
replaces="py-atpublic"
builddir="$srcdir"/$_pyname-$pkgver

prepare() {
	default_prepare
	# Remove pdm garbage
	cp "$srcdir"/pyproject.toml "$builddir"
}


build() {
	python3 -m build --no-isolation --wheel
	python3 setup.py build
}

check() {
	export PYTHONPATH="$builddir"/src
	python3 -m pytest
	pytest-3
}

package() {
	python3 -m installer -d"$pkgdir" dist/$_pyname-$pkgver-py3-none-any.whl
	python3 setup.py install --prefix=/usr --root="$pkgdir"
}

sha512sums="
b34dbb236717b2017de95aa79226f0138e77814a4041e26e98f50db8f8521d81b60f9998aed719e1e1f2ee29a7c590170725e12a54260900ce9819ea3a623dac  atpublic-3.1.1.tar.gz
a3ef1b33c4872937a659a76450e63f707b10a9193a0246e339d939aff4b643f4db01eb0a962050e7c8267f847c3eacf5b4b15b3ec775840b36ce7977784c33de  pyproject.toml
88c140c7ca0cfe3db791fd43a97f9fc63de979191a026df4d9f7a34a347b657d7d7b6fb7e31a231ac3adbc5e5d014b8e3c3606b93515a6ad42ea3d101b480329  atpublic-2.3.tar.gz
"

D pkgsrc/py3-atpublic/pyproject.toml => pkgsrc/py3-atpublic/pyproject.toml +0 -97
@@ 1,97 0,0 @@
[project]
name = "atpublic"
authors = [
    { name = "Barry Warsaw", email = "barry@python.org" },
]
description = "Keep all y'all's __all__'s in sync"
readme = "README.rst"
requires-python = ">=3.7"
keywords = [
    "__all__",
    "public",
    "private",
]
classifiers = [
    "Development Status :: 5 - Production/Stable",
    "Development Status :: 6 - Mature",
    "Intended Audience :: Developers",
    "License :: OSI Approved :: Apache Software License",
    "Operating System :: POSIX",
    "Operating System :: MacOS :: MacOS X",
    "Operating System :: Microsoft :: Windows",
    "Programming Language :: Python",
    "Programming Language :: Python :: 3",
    "Topic :: Software Development :: Libraries",
    "Topic :: Software Development :: Libraries :: Python Modules",
    "Topic :: Utilities",
]
dependencies = []
dynamic = []
version = "3.1.1"

[project.license]
text = "Apache-2.0"

[project.urls]
"Home Page" = "https://public.readthedocs.io"
Documentation = "https://public.readthedocs.io"
Source = "https://gitlab.com/warsaw/public.git"
"Bug Tracker" = "https://gitlab.com/warsaw/public/issues"

[project.optional-dependencies]

[tool.pytest.ini_options]
addopts = "--cov=public --cov-report=term --cov-report=xml -p no:doctest"
testpaths = "test docs"

[tool.coverage.report]
fail_under = 100
show_missing = true

[tool.coverage.run]
branch = true
parallel = true

[tool.isort]
include_trailing_comma = true
known_first_party = "public"
length_sort_straight = true
lines_after_imports = 2
lines_between_types = 1
multi_line_output = 3
order_by_type = false
skip = [
    "conf.py",
]

[tool.mypy]
mypy_path = "src"
disallow_any_generics = true
disallow_subclassing_any = true
disallow_untyped_calls = false
disallow_untyped_defs = true
disallow_incomplete_defs = true
check_untyped_defs = true
disallow_untyped_decorators = false
no_implicit_optional = true
warn_redundant_casts = true
warn_unused_ignores = true
warn_no_return = true
warn_return_any = true
warn_unreachable = true
implicit_reexport = false
strict_equality = true
show_error_context = true
show_column_numbers = true
show_error_codes = true
pretty = true
show_absolute_path = true
warn_unused_configs = true
verbosity = 0

[[tool.mypy.overrides]]
module = [
    "pytest",
    "sybil.*",
]
ignore_missing_imports = true

M pkgsrc/py3-pygments/APKBUILD => pkgsrc/py3-pygments/APKBUILD +3 -3
@@ 2,8 2,8 @@
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=py3-pygments
_pkgname=Pygments
pkgver=2.13.0
pkgrel=0
pkgver=2.11.2
pkgrel=2
pkgdesc="Syntax highlighting package written in Python"
url="https://pygments.org/"
arch="noarch"


@@ 59,6 59,6 @@ doc() {
}

sha512sums="
d492acf112423fa997f35d6d3cae18b89bf11619c696879c6df49697dca933b6d54d7cb22907e06812e0a562f03e8ed5ccefde5247bc1c51cf2d3d69e7d65422  Pygments-2.13.0.tar.gz
606ff0c35fa47882f4c5c3794827132e1ee6ccbb4895ae858f9c93ea0c92b73163c9f4d630b51a8bb782ba0b4944a66d1059ad5d017d3191a0a5b30c1e5b8f9f  Pygments-2.11.2.tar.gz
9787753652d4ae322d8fdb11464a6b1682e77070284a2b173e0087435a6aeb10b7320b327a957363a7eb94ff763446ee451e04dd91b25f901a72128fb2e2bb56  0001-lexers-add-Hare.patch
"