commit: ced954b5000f9b21250643fc2edc2336dc858831 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Sun Feb 2 17:11:03 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Sun Feb 2 17:27:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ced954b5
sci-mathematics/mathlib-tools: treeclean Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> profiles/features/wd40/package.mask | 1 - profiles/package.mask | 1 - sci-mathematics/mathlib-tools/Manifest | 1 - .../files/mathlib-tools-1.3.2-pull-131.patch | 84 ---------------------- .../mathlib-tools/mathlib-tools-1.3.2_p1.ebuild | 56 --------------- sci-mathematics/mathlib-tools/metadata.xml | 20 ------ 6 files changed, 163 deletions(-) diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask index 1237c6125a51..4b33cfbd0b8a 100644 --- a/profiles/features/wd40/package.mask +++ b/profiles/features/wd40/package.mask @@ -143,7 +143,6 @@ dev-python/pysnmpcrypto dev-java/icedtea-web dev-debug/pwndbg dev-db/mycli -sci-mathematics/mathlib-tools dev-python/keep dev-db/pgcli dev-db/mysql-workbench diff --git a/profiles/package.mask b/profiles/package.mask index a8b8c345e885..89445aba3469 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -287,7 +287,6 @@ net-im/whatsie # (https://github.com/leanprover-community/mathlib-tools). Migrate to LEAN 4. # Removal on 2025-02-02 sci-mathematics/lean:0/3 -sci-mathematics/mathlib-tools # Maciej Barć <[email protected]> (2025-01-02) # Upstream dead, repo archived (https://github.com/mono/xsp). Uses deprecated diff --git a/sci-mathematics/mathlib-tools/Manifest b/sci-mathematics/mathlib-tools/Manifest deleted file mode 100644 index cba80086497b..000000000000 --- a/sci-mathematics/mathlib-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mathlib-tools-1.3.2_p1.gh.tar.gz 36686 BLAKE2B 0120e64821c183e368a4ca7d7122146637b933c9f56279c15716c825ac6e0e20d19f8ece731ee5c4114b7c221e84b53d3b89fcc0268529cbd1f2ad3328ac7847 SHA512 7b3c5a8aea19a4c7df366c71baa19e3d8ab6a0a6b387973ed37aecf3003361f298b85a4deecc8a4fcb6a2003f666c503fd66cde986e412003d439d48345afbc7 diff --git a/sci-mathematics/mathlib-tools/files/mathlib-tools-1.3.2-pull-131.patch b/sci-mathematics/mathlib-tools/files/mathlib-tools-1.3.2-pull-131.patch deleted file mode 100644 index 2debd3d6b396..000000000000 --- a/sci-mathematics/mathlib-tools/files/mathlib-tools-1.3.2-pull-131.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- a/mathlibtools/lib.py -+++ b/mathlibtools/lib.py -@@ -21,7 +21,8 @@ - - import requests - from tqdm import tqdm # type: ignore --import toml -+import tomli -+import tomli_w - import yaml - from git import (Repo, Commit, InvalidGitRepositoryError, # type: ignore - GitCommandError, BadName, RemoteReference) # type: ignore -@@ -84,7 +85,7 @@ def mathlib_lean_version() -> VersionTuple: - """Return the latest Lean release supported by mathlib""" - resp = requests.get("https://raw.githubusercontent.com/leanprover-community/mathlib/master/leanpkg.toml";) - assert resp.status_code == 200 -- conf = toml.loads(resp.text) -+ conf = tomli.loads(resp.text) - return parse_version(conf['package']['lean_version']) - - def set_download_url(url: str = AZURE_URL) -> None: -@@ -441,7 +442,8 @@ def from_path(cls, path: Path, cache_url: str = '', - except ValueError: - rev = '' - directory = find_root(path) -- config = toml.load(directory/'leanpkg.toml') -+ with (directory/'leanpkg.toml').open('rb') as pkgtoml: -+ config = tomli.load(pkgtoml) - - return cls(repo, is_dirty, rev, directory, - config['package'], config['dependencies'], -@@ -456,7 +458,8 @@ def user_wide(cls, cache_url: str = '', - version of Lean supported by mathlib.""" - directory = Path.home()/'.lean' - try: -- config = toml.load(directory/'leanpkg.toml') -+ with (directory/'leanpkg.toml').open('rb') as pkgtoml: -+ config = tomli.load(pkgtoml) - except FileNotFoundError: - directory.mkdir(exist_ok=True) - version = mathlib_lean_version() -@@ -469,8 +472,8 @@ def user_wide(cls, cache_url: str = '', - pkg = { 'name': '_user_local_packages', - 'version': '1', - 'lean_version': version_str } -- with (directory/'leanpkg.toml').open('w') as pkgtoml: -- toml.dump({'package': pkg}, pkgtoml) -+ with (directory/'leanpkg.toml').open('wb') as pkgtoml: -+ tomli_w.dump({'package': pkg}, pkgtoml) - config = { 'package': pkg, 'dependencies': dict() } - - return cls(None, False, '', directory, -@@ -534,7 +537,8 @@ def mathlib_repo(self) -> Repo: - - def read_config(self) -> None: - try: -- config = toml.load(self.directory/'leanpkg.toml') -+ with (self.directory/'leanpkg.toml').open('rb') as pkgtoml: -+ config = tomli.load(pkgtoml) - except FileNotFoundError: - raise InvalidLeanProject('Missing leanpkg.toml') - -@@ -551,7 +555,7 @@ def write_config(self) -> None: - # for dependencies. - with (self.directory/'leanpkg.toml').open('w') as cfg: - cfg.write('[package]\n') -- cfg.write(toml.dumps(self.pkg_config)) -+ cfg.write(tomli_w.dumps(self.pkg_config)) - cfg.write('\n[dependencies]\n') - for dep, val in self.deps.items(): - nval = str(val).replace("'git':", 'git =').replace( - ---- a/setup.py -+++ b/setup.py -@@ -28,7 +28,7 @@ - "License :: OSI Approved :: Apache Software License", - "Operating System :: OS Independent" ], - python_requires='>=3.6', -- install_requires=['toml>=0.10.0', 'PyGithub', 'certifi', 'gitpython>=2.1.11', 'requests', -+ install_requires=['tomli', 'tomli-w', 'PyGithub', 'certifi', 'gitpython>=2.1.11', 'requests', - 'Click', 'tqdm', 'networkx', 'pydot', - 'PyYAML>=3.13', 'atomicwrites', "dataclasses; python_version=='3.6'"] - ) - diff --git a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild b/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild deleted file mode 100644 index 80869ab68400..000000000000 --- a/sci-mathematics/mathlib-tools/mathlib-tools-1.3.2_p1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="Development tools for Lean's mathlib" -HOMEPAGE="https://github.com/leanprover-community/mathlib-tools"; - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/leanprover-community/${PN}.git"; -else - _PV=${PV/_p1/} - SRC_URI="https://github.com/leanprover-community/${PN}/archive/v${_PV}.tar.gz - -> ${P}.gh.tar.gz" - S="${WORKDIR}"/${PN}-${_PV} - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" - -BDEPEND=" - >=dev-python/gitpython-2.1.11[${PYTHON_USEDEP}] - dev-python/pygithub[${PYTHON_USEDEP}] - dev-python/atomicwrites[${PYTHON_USEDEP}] - dev-python/certifi[${PYTHON_USEDEP}] - dev-python/click[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/pydot[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/tomli-w[${PYTHON_USEDEP}] - dev-python/tomli[${PYTHON_USEDEP}] - dev-python/tqdm[${PYTHON_USEDEP}] -" -RDEPEND=" - ${BDEPEND} - sci-mathematics/lean:0/3 -" - -PATCHES=( "${FILESDIR}"/${PN}-1.3.2-pull-131.patch ) - -distutils_enable_tests pytest - -src_prepare() { - # Remove problematic tests (mainly issues with network) - rm ./tests/test_functional.py || die - - distutils-r1_python_prepare_all -} diff --git a/sci-mathematics/mathlib-tools/metadata.xml b/sci-mathematics/mathlib-tools/metadata.xml deleted file mode 100644 index c2598dacd8a7..000000000000 --- a/sci-mathematics/mathlib-tools/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> - -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Mathematics Project</name> - </maintainer> - <longdescription> - This package contains leanproject, a supporting tool for Lean mathlib. - More info: - - https://leanprover-community.github.io/toolchain.html#handling-dependencies - - https://leanprover-community.github.io/leanproject.html - </longdescription> - <upstream> - <changelog>https://github.com/leanprover-community/mathlib-tools/blob/master/CHANGELOG.md</changelog> - <bugs-to>https://github.com/leanprover-community/mathlib-tools/issues</bugs-to> - <remote-id type="github">leanprover-community/mathlib-tools</remote-id> - </upstream> -</pkgmetadata>
