diff options
Diffstat (limited to 'dev-python/black')
| -rw-r--r-- | dev-python/black/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/black/black-21.12_beta0-r1.ebuild | 67 | ||||
| -rw-r--r-- | dev-python/black/black-21.12_beta0.ebuild | 61 | ||||
| -rw-r--r-- | dev-python/black/files/black-21.12_beta0-support-tomli-2.patch | 40 |
4 files changed, 0 insertions, 169 deletions
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest index 17cd98220065..1151d6b0ba7c 100644 --- a/dev-python/black/Manifest +++ b/dev-python/black/Manifest @@ -1,3 +1,2 @@ -DIST black-21.12b0.tar.gz 1200305 BLAKE2B cd019b230d2ba1fab88075a5e14cb5de88a4ee283b53d869564f071a104d2810ca31c04db09310b99a1610bdace7d5b9b360b2a3a4810822322a4eacc8998ad8 SHA512 1f6e4eeafd653fa9db608585110f5c5067942031b2d67e630befa899d7fca3c35f52cbde8fc91c2697fb294fb16525254756ebce16e556fc139b621f738bfa22 DIST black-22.1.0.tar.gz 1161720 BLAKE2B d74cbdd39dc1576583cee57089cb6d75a338f2d6640697adda79d38d02eeb51664049dca934d5014761d0fd4080ca2f40a3ea10c30e40bde9fe6af6c178b202c SHA512 9b97a3b32ecebebeb61ea581784a9b2215540c20533097fe87d5ef3c046dbe7c2ab8f2f21d1884cbe0ddd458434f17eb9b540764f955385873e6fdef86c3014c DIST black-22.3.0.tar.gz 1154456 BLAKE2B c89b43722839748dff0ce60debb684cd8eeae5ef5fb7e080f6b0031412381d7be121ce62ad252a67fa7930726243680a4bf183417611617be5af39722164289d SHA512 fc44576b93a6e158f625ad5444247f6a59a1ebcc7f0c73ed40d557a9a865457b297eabd492f01999e51ee3e5c3fa83f3d6e3c10937ecaa8c1d36f7541736d2e4 diff --git a/dev-python/black/black-21.12_beta0-r1.ebuild b/dev-python/black/black-21.12_beta0-r1.ebuild deleted file mode 100644 index 140a9e45a8a2..000000000000 --- a/dev-python/black/black-21.12_beta0-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 optfeature - -MY_PV="${PV//_beta/b}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="The uncompromising Python code formatter" -HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black" -SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos" - -RDEPEND=" - >=dev-python/click-8.0.0[${PYTHON_USEDEP}] - >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] - >=dev-python/platformdirs-2[${PYTHON_USEDEP}] - <dev-python/pathspec-1[${PYTHON_USEDEP}] - <dev-python/tomli-3[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/typing-extensions[${PYTHON_USEDEP}] - ' python3_{8,9}) -" -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] - dev-python/aiohttp-cors[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - # Merged in master - "${FILESDIR}/${P}-support-tomli-2.patch" -) - -distutils_enable_tests pytest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV} - -src_prepare() { - # remove unnecessary bind that worked around broken 6.1.0/6.2.0 releases - sed -i -e '/setuptools_scm/s:~=:>=:' \ - -e 's/setuptools_scm\[toml\]>=[0-9.]*/setuptools_scm[toml]/' setup.cfg || die - distutils-r1_src_prepare -} - -python_test() { - cp "${S}"/src/black_primer/primer.json \ - "${BUILD_DIR}"/lib/black_primer/primer.json || die - distutils_install_for_testing - epytest -m "not python2" -} - -pkg_postinst() { - optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors" -} diff --git a/dev-python/black/black-21.12_beta0.ebuild b/dev-python/black/black-21.12_beta0.ebuild deleted file mode 100644 index 92783419ca96..000000000000 --- a/dev-python/black/black-21.12_beta0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit distutils-r1 optfeature - -MY_PV="${PV//_beta/b}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="The uncompromising Python code formatter" -HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black" -SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos" - -RDEPEND=" - >=dev-python/click-8.0.0[${PYTHON_USEDEP}] - >=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}] - >=dev-python/platformdirs-2[${PYTHON_USEDEP}] - <dev-python/pathspec-1[${PYTHON_USEDEP}] - <dev-python/tomli-2[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/typing-extensions[${PYTHON_USEDEP}] - ' python3_{8,9}) -" -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - >=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}] - dev-python/aiohttp-cors[${PYTHON_USEDEP}] - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/parameterized[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -export SETUPTOOLS_SCM_PRETEND_VERSION=${MY_PV} - -src_prepare() { - # remove unnecessary bind that worked around broken 6.1.0/6.2.0 releases - sed -i -e '/setuptools_scm/s:~=:>=:' \ - -e 's/setuptools_scm\[toml\]>=[0-9.]*/setuptools_scm[toml]/' setup.cfg || die - distutils-r1_src_prepare -} - -python_test() { - cp "${S}"/src/black_primer/primer.json \ - "${BUILD_DIR}"/lib/black_primer/primer.json || die - distutils_install_for_testing - epytest -m "not python2" -} - -pkg_postinst() { - optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors -} diff --git a/dev-python/black/files/black-21.12_beta0-support-tomli-2.patch b/dev-python/black/files/black-21.12_beta0-support-tomli-2.patch deleted file mode 100644 index 5374dc6e82a9..000000000000 --- a/dev-python/black/files/black-21.12_beta0-support-tomli-2.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 389e9c23a9e622ee6090d902cc5f56c5f76cdee9 Mon Sep 17 00:00:00 2001 -From: Taneli Hukkinen <3275109+hukkin@users.noreply.github.com> -Date: Tue, 21 Dec 2021 18:03:07 +0200 -Subject: [PATCH] Disable universal newlines when reading TOML (#2408) - ---- a/Pipfile -+++ b/Pipfile -@@ -42,7 +42,7 @@ platformdirs= ">=2" - click = ">=8.0.0" - mypy_extensions = ">=0.4.3" - pathspec = ">=0.8.1" --tomli = ">=0.2.6, <2.0.0" -+tomli = ">=1.1.0, <3.0.0" - typed-ast = "==1.4.3" - typing_extensions = {markers = "python_version < '3.10'", version = ">=3.10.0.0"} - black = {editable = true,extras = ["d"],path = "."} ---- a/setup.py -+++ b/setup.py -@@ -99,7 +99,7 @@ def find_python_files(base: Path) -> List[Path]: - install_requires=[ - "click>=7.1.2", - "platformdirs>=2", -- "tomli>=0.2.6,<2.0.0", -+ "tomli>=1.1.0,<3.0.0", - "typed-ast>=1.4.2; python_version < '3.8' and implementation_name == 'cpython'", - "pathspec>=0.9.0, <1", - "dataclasses>=0.6; python_version < '3.7'", ---- a/src/black/files.py -+++ b/src/black/files.py -@@ -95,8 +95,8 @@ def parse_pyproject_toml(path_config: str) -> Dict[str, Any]: - - If parsing fails, will raise a tomli.TOMLDecodeError - """ -- with open(path_config, encoding="utf8") as f: -- pyproject_toml = tomli.loads(f.read()) -+ with open(path_config, "rb") as f: -+ pyproject_toml = tomli.load(f) - config = pyproject_toml.get("tool", {}).get("black", {}) - return {k.replace("--", "").replace("-", "_"): v for k, v in config.items()} - |