Sven-Hendrik Haase pushed to branch main at Arch Linux / Packaging / Packages / python-omegaconf
Commits: c53f14f3 by loqs at 2026-03-04T22:37:19+00:00 Remove pkg_resources Related https://archlinux.org/todo/python-pkg_resources-deprecation/. - - - - - 4 changed files: - .SRCINFO - PKGBUILD - REUSE.toml - + python-omegaconf-2.3.0-remove-pkg_resources.patch Changes: ===================================== .SRCINFO ===================================== @@ -14,7 +14,9 @@ pkgbase = python-omegaconf depends = python-yaml source = python-omegaconf-2.3.0.tar.gz::https://files.pythonhosted.org/packages/source/o/omegaconf/omegaconf-2.3.0.tar.gz source = antlr4-jar.patch + source = python-omegaconf-2.3.0-remove-pkg_resources.patch sha256sums = d5d4b6d29955cc50ad50c46dc269bcd92c6e00f5f90d23ab5fee7bfca4ba4cc7 sha256sums = 9e27af3dfc66fbd239f16c000acb73adf872376d1c1b041ff31d1fc5b57389bb + sha256sums = f8512d327e34915f1f28a4dddcfd180e24a5642428a889bedb13867d605b5427 pkgname = python-omegaconf ===================================== PKGBUILD ===================================== @@ -14,12 +14,15 @@ depends=('python-antlr4' 'python-yaml') makedepends=('antlr4' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel') # checkdepends=('python-pytest' 'python-pytest-mock' 'python-pytest-lazy-fixture') source=("$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/o/$_pkg/$_pkg-$pkgver.tar.gz"; - 'antlr4-jar.patch') + 'antlr4-jar.patch' + 'python-omegaconf-2.3.0-remove-pkg_resources.patch') sha256sums=('d5d4b6d29955cc50ad50c46dc269bcd92c6e00f5f90d23ab5fee7bfca4ba4cc7' - '9e27af3dfc66fbd239f16c000acb73adf872376d1c1b041ff31d1fc5b57389bb') + '9e27af3dfc66fbd239f16c000acb73adf872376d1c1b041ff31d1fc5b57389bb' + 'f8512d327e34915f1f28a4dddcfd180e24a5642428a889bedb13867d605b5427') prepare() { patch -p1 -d "$_pkg-$pkgver" < antlr4-jar.patch + patch -p1 -d "$_pkg-$pkgver" < python-omegaconf-2.3.0-remove-pkg_resources.patch } build() { ===================================== REUSE.toml ===================================== @@ -24,6 +24,7 @@ SPDX-License-Identifier = "0BSD" [[annotations]] path = [ "antlr4-jar.patch", + "python-omegaconf-2.3.0-remove-pkg_resources.patch", ] SPDX-FileCopyrightText = "python-omegaconf contributors" SPDX-License-Identifier = "BSD-3-Clause" ===================================== python-omegaconf-2.3.0-remove-pkg_resources.patch ===================================== @@ -0,0 +1,24 @@ +diff --git a/setup.py b/setup.py +index 6088f1d..af62e9e 100644 +--- a/setup.py ++++ b/setup.py +@@ -10,7 +10,6 @@ OmegaConf setup + """ + import pathlib + +-import pkg_resources + import setuptools + + from build_helpers.build_helpers import ( +@@ -24,8 +23,9 @@ from build_helpers.build_helpers import ( + + with pathlib.Path("requirements/base.txt").open() as requirements_txt: + install_requires = [ +- str(requirement) +- for requirement in pkg_resources.parse_requirements(requirements_txt) ++ line.strip() ++ for line in requirements_txt ++ if line.strip() and not line.startswith("#") + ] + + View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/python-omegaconf/-/commit/c53f14f3fe7513da45d0dcdbc4816fee2d7e9f32 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/python-omegaconf/-/commit/c53f14f3fe7513da45d0dcdbc4816fee2d7e9f32 You're receiving this email because of your account on gitlab.archlinux.org.
