From 04f084f2d40a962d3fbad3de817f4ce0df31ef44 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sun, 20 Oct 2024 00:57:33 +0200 Subject: gnu: debops: Update to 3.2.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/debops-constants-for-external-program-names.patch and gnu/packages/patches/debops-debops-defaults-fall-back-to-less.patch: Remove patches. * gnu/packages/patches/debops-setup-py-avoid-git.patch: Add patch. * gnu/local.mk: Adjust patches. * gnu/packages/admin.scm (debops): Update to 3.2.2. [source]: Adjust patches. [build-system]: Switch to pyproject-build-system. [native-inputs]: Remove git. [inputs]: Add git, git-crypt. [propagated-inputs]: Reorder. Add python-dotenv, python-future, python-gitpython, python-jinja2, python-pyyaml, python-pyxdg, python-toml. [arguments]<#:tests?>: Unset (although no tests in source). <#:phases>: Remove all existing modifications. Add 'wrap-script phase. <#:modules>: Add for <#phases>. Signed-off-by: Ludovic Courtès --- .../patches/debops-setup-py-avoid-git.patch | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 gnu/packages/patches/debops-setup-py-avoid-git.patch (limited to 'gnu/packages/patches/debops-setup-py-avoid-git.patch') diff --git a/gnu/packages/patches/debops-setup-py-avoid-git.patch b/gnu/packages/patches/debops-setup-py-avoid-git.patch new file mode 100644 index 0000000000..7586e661db --- /dev/null +++ b/gnu/packages/patches/debops-setup-py-avoid-git.patch @@ -0,0 +1,38 @@ +From a6219db1c473f862a2dddbdef9593d8a57dfc9ae Mon Sep 17 00:00:00 2001 +From: Nicolas Graves +Date: Sat, 19 Oct 2024 19:49:30 +0200 +Subject: [PATCH] setup: Don't rely on git to set the version. + +--- + setup.py | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/setup.py b/setup.py +index 0fc4555a4..98e4bffac 100755 +--- a/setup.py ++++ b/setup.py +@@ -48,20 +48,7 @@ except NameError: + return s + return s and s.decode('utf-8') or None + +-# Retrieve the project version from 'git describe' command and store it in the +-# __version__.py and VERSION files, needed for correct installation of the +-# Python package +-try: +- with open(os.devnull, 'w') as devnull: +- GIT_RELEASE = subprocess.check_output( +- ['git', 'describe'], stderr=devnull +- ).strip().lstrip(b'v').decode('utf-8').split('-') +- if len(GIT_RELEASE) > 1: +- RELEASE = (GIT_RELEASE[0] + '.dev' + GIT_RELEASE[1] +- + '+' + GIT_RELEASE[2]) +- else: +- RELEASE = GIT_RELEASE[0] +-except subprocess.CalledProcessError: ++if True: + try: + RELEASE = open('VERSION').read().strip() + except Exception: +-- +2.46.0 + -- cgit v1.2.3