commit: 939ffb63d619dd0cf95d3feb1420c307bc5c1cd0 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Aug 11 19:06:33 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Aug 11 19:08:02 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939ffb63
dev-python/hypercorn: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/hypercorn/Manifest | 1 - .../hypercorn/files/hypercorn-0.14.3-tomli.patch | 106 --------------------- dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild | 51 ---------- 3 files changed, 158 deletions(-) diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest index b66ae29a2500..0f483ed03933 100644 --- a/dev-python/hypercorn/Manifest +++ b/dev-python/hypercorn/Manifest @@ -1,2 +1 @@ -DIST hypercorn-0.14.3.gh.tar.gz 154930 BLAKE2B da827d586307ace6ef9ddb8ca4046ebc5c745df1d48152ed78b948751a7d472c73d5f8310e58266158af4739e14f2960a46c2e7fc7f12bf7629a3edb3821b58f SHA512 f0d69ab1883379058112907547e6f89a4a7114d7f4851b92f0c465d73def9cc15508e3981bda7e66ce3c00e896f7fb221b3dcd8bee6a51d8429572b678b7ade8 DIST hypercorn-0.14.4.gh.tar.gz 156001 BLAKE2B 262cbaba3df674b07dd5f6c15418cac18b46c2303a8ff616c8d2e968ff233d15bf616f2d3d0dbacda03f819251453be1b00cee4b98fdfaaed49f40cdcfb43119 SHA512 461b6fab72586b3bdea25ded6c0439595a8f84d5fb0b1a264f976926d9d34cb21f52bd10c84b9180d08fb05942f9fdb842343d4c6c476dcd60a26399387a2373 diff --git a/dev-python/hypercorn/files/hypercorn-0.14.3-tomli.patch b/dev-python/hypercorn/files/hypercorn-0.14.3-tomli.patch deleted file mode 100644 index a438680423a9..000000000000 --- a/dev-python/hypercorn/files/hypercorn-0.14.3-tomli.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 676612c73d3c231f823f88ea0995e80522db6178 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Mon, 19 Dec 2022 15:27:41 +0100 -Subject: [PATCH] Use tomllib/tomli for .toml support - -Replace the unmaintained and non-conformant `toml` library with -the built-in `tomllib` module in Python 3.11+, with fallback to `tomli` -(featuring the same ABI) in Python 3.10 and older. ---- - pyproject.toml | 2 +- - src/hypercorn/config.py | 10 +++++++--- - src/hypercorn/logging.py | 10 +++++++--- - tox.ini | 1 - - 4 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 71ceaff..1334fcf 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -30,7 +30,7 @@ h11 = "*" - h2 = ">=3.1.0" - priority = "*" - pydata_sphinx_theme = { version = "*", optional = true } --toml = "*" -+tomli = { version = "*", python = "<3.11" } - trio = { version = ">=0.11.0", optional = true } - typing_extensions = { version = ">=3.7.4", python = "<3.8" } - uvloop = { version = "*", markers = "platform_system != 'Windows'", optional = true } -diff --git a/src/hypercorn/config.py b/src/hypercorn/config.py -index f9a9d66..ecfa1bd 100644 ---- a/src/hypercorn/config.py -+++ b/src/hypercorn/config.py -@@ -6,6 +6,7 @@ import logging - import os - import socket - import stat -+import sys - import types - import warnings - from dataclasses import dataclass -@@ -22,7 +23,10 @@ from time import time - from typing import Any, AnyStr, Dict, List, Mapping, Optional, Tuple, Type, Union - from wsgiref.handlers import format_date_time - --import toml -+if sys.version_info >= (3, 11): -+ import tomllib -+else: -+ import tomli as tomllib - - from .logging import Logger - -@@ -355,8 +359,8 @@ class Config: - filename: The filename which gives the path to the file. - """ - file_path = os.fspath(filename) -- with open(file_path) as file_: -- data = toml.load(file_) -+ with open(file_path, "rb") as file_: -+ data = tomllib.load(file_) - return cls.from_mapping(data) - - @classmethod -diff --git a/src/hypercorn/logging.py b/src/hypercorn/logging.py -index 3c2c657..8ca6105 100644 ---- a/src/hypercorn/logging.py -+++ b/src/hypercorn/logging.py -@@ -9,7 +9,11 @@ from http import HTTPStatus - from logging.config import dictConfig, fileConfig - from typing import Any, IO, Mapping, Optional, TYPE_CHECKING, Union - --import toml -+if sys.version_info >= (3, 11): -+ import tomllib -+else: -+ import tomli as tomllib -+ - - if TYPE_CHECKING: - from .config import Config -@@ -65,8 +69,8 @@ class Logger: - with open(config.logconfig[5:]) as file_: - dictConfig(json.load(file_)) - elif config.logconfig.startswith("toml:"): -- with open(config.logconfig[5:]) as file_: -- dictConfig(toml.load(file_)) -+ with open(config.logconfig[5:], "rb") as file_: -+ dictConfig(tomllib.load(file_)) - else: - log_config = { - "__file__": config.logconfig, -diff --git a/tox.ini b/tox.ini -index 675992b..0f636fb 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -47,7 +47,6 @@ basepython = python3.10 - deps = - mypy - pytest -- types-toml - commands = - mypy src/hypercorn/ tests/ - --- -2.39.0 - diff --git a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild b/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild deleted file mode 100644 index 35d0f3433123..000000000000 --- a/dev-python/hypercorn/hypercorn-0.14.3-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="A ASGI Server based on Hyper libraries and inspired by Gunicorn" -HOMEPAGE=" - https://github.com/pgjones/hypercorn/ - https://pypi.org/project/hypercorn/ -" -SRC_URI=" - https://github.com/pgjones/hypercorn/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - dev-python/h11[${PYTHON_USEDEP}] - >=dev-python/h2-3.1.0[${PYTHON_USEDEP}] - dev-python/priority[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/tomli[${PYTHON_USEDEP}] - ' 3.{8..10}) - >=dev-python/wsproto-0.14.0[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-trio[${PYTHON_USEDEP}] - dev-python/trio[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - "${FILESDIR}"/${P}-tomli.patch - ) - - sed -i -e 's:--no-cov-on-fail::' pyproject.toml || die - distutils-r1_src_prepare -}
