Dear maintainer,

I'm going to upload a NMU in DELAYED/3-days to fix this RC bug.
I'm attaching the patch that I applied.

If you have any objections or would you like to make the changes
yourself please let me know.

-- 
cheers,
        Emmanuel Arias

 ⢀⣴⠾⠻⢶⣦⠀
 ⣾⠁⢠⠒⠀⣿⡁  eam...@debian.org
 ⢿⡄⠘⠷⠚⠋⠀  OpenPGP: 13796755BBC72BB8ABE2AEB5 FA9DEC5DE11C63F1                    
 
 ⠈⠳⣄
From 37becd428f5981b1750a23e1c9d13ed26318bc1c Mon Sep 17 00:00:00 2001
From: Emmanuel Arias <eam...@debian.org>
Date: Wed, 10 Jul 2024 21:39:51 -0300
Subject: [PATCH] Non-maintainer upload.

* Non-maintainer upload.
* Remove python3-distutils fom package (Closes: #1065849).
---
 debian/changelog                      |  7 ++++
 debian/control                        |  1 -
 debian/patches/remove_distutils.patch | 49 +++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/remove_distutils.patch

diff --git a/debian/changelog b/debian/changelog
index 559c4cb..9d2c894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+docker-pycreds (0.3.0-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove python3-distutils fom package (Closes: #1065849).
+
+ -- Emmanuel Arias <eam...@debian.org>  Wed, 10 Jul 2024 21:34:26 -0300
+
 docker-pycreds (0.3.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 6e64ab9..a1c4ef7 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Depends: ${misc:Depends},
          ${python3:Depends},
          golang-docker-credential-helpers,
          python3-six,
-         python3-distutils,
 Description: Python3 bindings for the docker credentials store API
  This module provides bindings to use the native OS credential storage
  provided by the golang-docker-credential-helpers package.
diff --git a/debian/patches/remove_distutils.patch b/debian/patches/remove_distutils.patch
new file mode 100644
index 0000000..586803e
--- /dev/null
+++ b/debian/patches/remove_distutils.patch
@@ -0,0 +1,49 @@
+Description: Remove references of distutils
+ This patch remove the use of distutils to remove python3-distutils from build
+ dependency.
+Author: Emmanuel Arias <eam...@debian.org>
+Bug-Debian: https://bugs.debian.org/1065849
+Forwarded: no
+Last-Update: 2024-07-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/dockerpycreds/utils.py
++++ b/dockerpycreds/utils.py
+@@ -1,4 +1,4 @@
+-import distutils.spawn
++from shutil import which
+ import os
+ import sys
+ 
+@@ -9,7 +9,7 @@
+     every extension declared in PATHEXT instead of just `.exe`
+     """
+     if sys.platform != 'win32':
+-        return distutils.spawn.find_executable(executable, path)
++        return which(executable, path=path)
+ 
+     if path is None:
+         path = os.environ['PATH']
+--- a/tests/store_test.py
++++ b/tests/store_test.py
+@@ -4,7 +4,7 @@
+ 
+ import pytest
+ import six
+-from distutils.spawn import find_executable
++from shutil import which
+ 
+ from dockerpycreds import (
+     CredentialsNotFound, Store, StoreError, DEFAULT_LINUX_STORE,
+@@ -23,9 +23,9 @@
+     def setup_method(self):
+         self.tmp_keys = []
+         if sys.platform.startswith('linux'):
+-            if find_executable('docker-credential-' + DEFAULT_LINUX_STORE):
++            if which('docker-credential-' + DEFAULT_LINUX_STORE):
+                 self.store = Store(DEFAULT_LINUX_STORE)
+-            elif find_executable('docker-credential-pass'):
++            elif which('docker-credential-pass'):
+                 self.store = Store('pass')
+             else:
+                 raise Exception('No supported docker-credential store in PATH')
diff --git a/debian/patches/series b/debian/patches/series
index fc80658..0909a3a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Relax-test-dependencies.patch
+remove_distutils.patch
-- 
2.43.0

Attachment: signature.asc
Description: PGP signature

Reply via email to