gentoo auto-resync : 11:08:2023 - 21:35:53

4 files changed, 2 insertions, 162 deletions

diff --git a/dev-python/hypercorn/Manifest b/dev-python/hypercorn/Manifest
index ebbded6f738f..a32d27176743 100644
--- a/dev-python/hypercorn/Manifest
+++ b/dev-python/hypercorn/Manifest
@@ -1,6 +1,3 @@
-AUX hypercorn-0.14.3-tomli.patch 3342 BLAKE2B 67b5b491e7b5b70f41748688b03a0ed2860d6b9dec280634d77b3323610723fd9c709e6b08dc094a7c4fe30673cc9dd159010f7ec695e2bfcdd19509eb52fb34 SHA512 7b4b8599d054a32895866132b1318b3ccd7899d455e09cbd7d3b4bb5f7c340dd78b7dc25bd40507c5af42bc713c193fa7aa503733019a312c945188da9e93dbc
-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
-EBUILD hypercorn-0.14.3-r1.ebuild 1150 BLAKE2B 8a9e79ed1751368cb6b35cc9f625cecae568dce7585452648a8f09a25a683b3cfa17143bcb82294a8a4f52a284b41beb132d1e106722298a27378c85efdff9af SHA512 1bb840ab61740be74f42575192674d724e4e309dd47d81d8d7eba581c8bc22568b68f171e80288b060562411fe0109c97926734def141e39f0b16c184b7b1eaf
-EBUILD hypercorn-0.14.4.ebuild 1167 BLAKE2B 50a56790ee74c413ffa2f4dceb398035703bec0e10f6f8ad056ad5234d83acd102043479b93294e4b42801fd77225540f24988983fd9f7c54d9639c4a79fe5e7 SHA512 1ba027d8c6253005adf78698154a5db76e4c05c07aef1e56e269ab7e2fd0dacb88ce7f21464a53a9bdb6c1fec6e14c678a3259b20c6979e47919cfba2c3de62f
+EBUILD hypercorn-0.14.4.ebuild 1159 BLAKE2B 3b1e86f45579c7293aa5e96a52e3929f261cd00f8aea4306202083597e4b2c2dd5cabb6d48a5cd0f12499bc3f231ea9c1a650a394e1f6f9feb40c2e1dee750c3 SHA512 bcc900808c8efa5926d1c4dabcc29695ca9f8185f6f0b183128ed20eb5808ab15b24ef1d89491d39e6ce210d1619be6b741ce3069a4cb8629d766998030c8e3c
 MISC metadata.xml 394 BLAKE2B ed2b00d93cd09682484b86b44f0e6cf0af2ebe7725c47afc5bdbc57b519b251fb0537c36d460ab4b427eeaddc4e61cd8970e3e91c3361279138171f838198fe8 SHA512 642d8e2b74e9ad6c79ee233589392202135328a37b04b29144aedd66f44a34bcdb36d38f5b7dee3c0e3ce2693f2b47cb86a9617d5c32ead5f3462ca1d047da0b
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?= <mgorny@gentoo.org>
-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
-}
diff --git a/dev-python/hypercorn/hypercorn-0.14.4.ebuild b/dev-python/hypercorn/hypercorn-0.14.4.ebuild
index cb1241731e13..a6d2d16cb137 100644
--- a/dev-python/hypercorn/hypercorn-0.14.4.ebuild
+++ b/dev-python/hypercorn/hypercorn-0.14.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/h11[${PYTHON_USEDEP}]