summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorSharlatan Hellseher <sharlatanus@gmail.com>2025-10-18 08:22:45 +0100
committerSharlatan Hellseher <sharlatanus@gmail.com>2025-10-18 12:54:05 +0100
commitbf18de787bf426dda95038e67506cc741f362fd1 (patch)
treebcc0f48f5f4e8fa8958b5136c57bf720e036d749 /gnu
parentb56d8a5a18dcc421a6c6d2cac9b2039b3d511d11 (diff)
gnu: python-configobj: Update to 5.0.9.
* gnu/packages/python-xyz.scm (python-configobj): Update to 5.0.9. Improve package style. [source] <patch>: Remove as no longer required. [build-system]: Switch to pyproject-build-system. [propagated-inputs]: Remove python-six. [native-inputs]: Add python-pytest and python-setuptools. * gnu/packages/patches/python-configobj-setuptools.patch: Delete file. * gnu/packages/python-xyz.scm (dist_patch_DATA): Deregister patch. Change-Id: I5ab0522a85626562d5ee4f0f2d02728f3d0459ba
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/python-configobj-setuptools.patch30
-rw-r--r--gnu/packages/python-xyz.scm35
3 files changed, 17 insertions, 49 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 6f29186ea1..d19e453722 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2159,7 +2159,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-reproducible-build.patch \
%D%/packages/patches/python-cross-compile.patch \
%D%/packages/patches/python-colour-remove-d2to1.patch \
- %D%/packages/patches/python-configobj-setuptools.patch \
%D%/packages/patches/python-debugpy-unbundle-pydevd.patch \
%D%/packages/patches/python-docopt-pytest6-compat.patch \
%D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \
diff --git a/gnu/packages/patches/python-configobj-setuptools.patch b/gnu/packages/patches/python-configobj-setuptools.patch
deleted file mode 100644
index 3f207ffd74..0000000000
--- a/gnu/packages/patches/python-configobj-setuptools.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 16fbc38f13e435b4e3e1a37d706e64e05bad4691 Mon Sep 17 00:00:00 2001
-From: Leo Famulari <leo@famulari.name>
-Date: Tue, 10 Nov 2015 23:09:24 -0500
-Subject: [PATCH] patch build to use setuptools
-
----
- setup.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index c6d57a6..27bf260 100644
---- a/setup.py
-+++ b/setup.py
-@@ -12,7 +12,12 @@
- # http://opensource.org/licenses/BSD-3-Clause
- import os
- import sys
--from distutils.core import setup
-+
-+try:
-+ from setuptools import setup
-+except ImportError:
-+ from distutils.core import setup
-+
- # a simple import wouldn't work if we moved towards a package with __init__
- from _version import __version__
-
---
-2.6.2
-
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f16aff83aa..4c872e40f2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19440,25 +19440,24 @@ objects.")
(define-public python-configobj
(package
(name "python-configobj")
- (version "5.0.6")
- (source (origin
- (method url-fetch)
- (uri (pypi-uri "configobj" version))
- (sha256
- (base32
- "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2"))
- ;; Patch setup.py so it looks for python-setuptools, which is
- ;; required to parse the keyword 'install_requires' in setup.py.
- (patches (search-patches "python-configobj-setuptools.patch"))))
- (build-system python-build-system)
- (propagated-inputs
- (list python-six))
- (synopsis "Config file reading, writing and validation")
- (description "ConfigObj is a simple but powerful config file reader and
-writer: an ini file round tripper. Its main feature is that it is very easy to
-use, with a straightforward programmer’s interface and a simple syntax for
-config files.")
+ (version "5.0.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "configobj" version))
+ (sha256
+ (base32 "0j3872id3ngxkaapz9bv8as4lg4rfmch0dxqy767p81syaxq3j03"))))
+ (build-system pyproject-build-system)
+ (native-inputs
+ (list python-pytest
+ python-setuptools))
(home-page "https://github.com/DiffSK/configobj")
+ (synopsis "Config file reading, writing and validation")
+ (description
+ "ConfigObj is a simple but powerful config file reader and writer: an
+ ini file round tripper. Its main feature is that it is very easy to use,
+with a straightforward programmer’s interface and a simple syntax for config
+files.")
(license license:bsd-3)))
(define-public python-omegaconf