diff mbox series

[1/1] package/crudini: bump to 0.9.5

Message ID 20240806074539.1261315-1-zgyarmati@zgyarmati.de
State Accepted
Headers show
Series [1/1] package/crudini: bump to 0.9.5 | expand

Commit Message

Zoltan Gyarmati Aug. 6, 2024, 7:45 a.m. UTC 
Removing backported patch and introducing new dependency
setuptools-scm.
As setuptools-scm doesn't work with github release tarballs, also
switching back to download the tarball from pypi...

Signed-off-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
---
 .../0001-prefer-shlex-over-pipes.patch        | 41 -------------------
 package/crudini/crudini.hash                  |  3 +-
 package/crudini/crudini.mk                    |  7 ++--
 3 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 package/crudini/0001-prefer-shlex-over-pipes.patch

Comments

Thomas Petazzoni Aug. 6, 2024, 11:59 a.m. UTC | #1 
On Tue,  6 Aug 2024 09:45:39 +0200
Zoltan Gyarmati <zgyarmati@zgyarmati.de> wrote:

> Removing backported patch and introducing new dependency
> setuptools-scm.
> As setuptools-scm doesn't work with github release tarballs, also
> switching back to download the tarball from pypi...
> 
> Signed-off-by: Zoltan Gyarmati <zgyarmati@zgyarmati.de>
> ---
>  .../0001-prefer-shlex-over-pipes.patch        | 41 -------------------
>  package/crudini/crudini.hash                  |  3 +-
>  package/crudini/crudini.mk                    |  7 ++--
>  3 files changed, 6 insertions(+), 45 deletions(-)
>  delete mode 100644 package/crudini/0001-prefer-shlex-over-pipes.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/crudini/0001-prefer-shlex-over-pipes.patch b/package/crudini/0001-prefer-shlex-over-pipes.patch
deleted file mode 100644
index 16296f619f..0000000000
--- a/package/crudini/0001-prefer-shlex-over-pipes.patch
+++ /dev/null
@@ -1,41 +0,0 @@ 
-From d81b703f3e8e29c1547386135c7e9ca539c1f054 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
-Date: Tue, 2 Aug 2022 14:40:37 +0100
-Subject: [PATCH] prefer shlex over pipes
-
-pipes is deprecated since python 3.10
-and slated for removal in python 3.13
-
-[Romain backport to 0.9.3]
-Upstream: https://github.com/pixelb/crudini/commit/e1650941054822faad4cda788bff6fe364eb4ca3
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
----
- crudini | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/crudini b/crudini
-index 669596b..a136241 100755
---- a/crudini
-+++ b/crudini
-@@ -17,15 +17,17 @@ import getopt
- import hashlib
- import iniparse
- import os
--import pipes
-+import re
- import shutil
- import string
- import tempfile
- 
- if sys.version_info[0] >= 3:
-+    import shlex as pipes
-     from io import StringIO
-     import configparser
- else:
-+    import pipes
-     from cStringIO import StringIO
-     import ConfigParser as configparser
- 
--- 
-2.34.3
-
diff --git a/package/crudini/crudini.hash b/package/crudini/crudini.hash
index 6f2563dfdd..5b92c0e4da 100644
--- a/package/crudini/crudini.hash
+++ b/package/crudini/crudini.hash
@@ -1,3 +1,4 @@ 
+# from https://pypi.org/project/crudini/#files
+sha256  59ae650f45af82a64afc33eb876909ee0c4888dc4e8711ef59731c1edfda5e24  crudini-0.9.5.tar.gz
 # locally computed
-sha256  e1b8125ac4373ece3bb0bb047ba9336e5bd55ed5d56b9729968058c9385ab546  crudini-0.9.3.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk
index 48e0ebde8f..0f5cfcedd9 100644
--- a/package/crudini/crudini.mk
+++ b/package/crudini/crudini.mk
@@ -4,14 +4,15 @@ 
 #
 ################################################################################
 
-CRUDINI_VERSION = 0.9.3
-CRUDINI_SITE = $(call github,pixelb,crudini,$(CRUDINI_VERSION))
+CRUDINI_VERSION = 0.9.5
+CRUDINI_SITE = https://files.pythonhosted.org/packages/32/67/c4e838930e2f434db08d6a6aadffca3d14e7455d1c2c2332e22003ad453d
 CRUDINI_SETUP_TYPE = setuptools
+CRUDINI_DEPENDENCIES = host-python-setuptools-scm
 CRUDINI_LICENSE = GPL-2.0
 CRUDINI_LICENSE_FILES = COPYING
 # This is a runtime dependency, but we don't have the concept of
 # runtime dependencies for host packages.
-HOST_CRUDINI_DEPENDENCIES = host-python-iniparse
+HOST_CRUDINI_DEPENDENCIES = host-python-iniparse host-python-setuptools-scm
 
 $(eval $(python-package))
 $(eval $(host-python-package))