15
0

Accepting request 949219 from home:pgajdos:python

- fix build with newer pythons
- added patches
  b41b17546c
  + python-PyCondor-collections.abc-Iterable.patch

OBS-URL: https://build.opensuse.org/request/show/949219
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyCondor?expand=0&rev=3
This commit is contained in:
2022-01-26 13:23:21 +00:00
committed by Git OBS Bridge
parent 56d3cd491e
commit 6834e0f6e7
3 changed files with 40 additions and 2 deletions

View File

@@ -0,0 +1,27 @@
From b41b17546c898d5cc2368b92fda86473c605e923 Mon Sep 17 00:00:00 2001
From: Duncan Macleod <duncanmmacleod@gmail.com>
Date: Thu, 18 Apr 2019 16:06:08 +0100
Subject: [PATCH] updated import for python3.8 (#140)
---
pycondor/job.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pycondor/job.py b/pycondor/job.py
index ef6f1bf..47762b6 100644
--- a/pycondor/job.py
+++ b/pycondor/job.py
@@ -1,7 +1,11 @@
import os
import subprocess
-from collections import namedtuple, Iterable
+from collections import namedtuple
+try:
+ from collections.abc import Iterable
+except ImportError: # python < 3.3
+ from collections import Iterable
from .utils import (checkdir, string_rep, requires_command,
split_command_string, decode_string)

View File

@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jan 26 10:22:01 UTC 2022 - pgajdos@suse.com
- fix build with newer pythons
- added patches
https://github.com/jrbourbeau/pycondor/commit/b41b17546c898d5cc2368b92fda86473c605e923
+ python-PyCondor-collections.abc-Iterable.patch
-------------------------------------------------------------------
Tue Aug 4 14:55:54 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package python-PyCondor
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,12 +24,14 @@ Summary: Python utility for HTCondor
License: MIT
URL: https://github.com/jrbourbeau/pycondor
Source: https://files.pythonhosted.org/packages/source/P/PyCondor/PyCondor-%{version}.tar.gz
# https://github.com/jrbourbeau/pycondor/commit/b41b17546c898d5cc2368b92fda86473c605e923
Patch0: python-PyCondor-collections.abc-Iterable.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires(post): update-alternatives
Requires(postun): update-alternatives
Requires(postun):update-alternatives
BuildArch: noarch
# SECTION For tests
BuildRequires: %{python_module click >= 7.0}
@@ -42,6 +44,7 @@ PyCondor (Python HTCondor) is a tool to help build and submit workflows to HTCon
%prep
%setup -q -n PyCondor-%{version}
%patch0 -p1
sed -Ei "1{/^#!\/usr\/bin\/env python/d}" pycondor/tests/example_script.py
%build