diff --git a/0.8.4.tar.gz b/0.8.4.tar.gz new file mode 100644 index 0000000..810b8c1 --- /dev/null +++ b/0.8.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26fdfaa0be02d9826f3ccfb07ebd1148ad238e7b2b247df223326c446df358b1 +size 8374 diff --git a/derpconf-0.8.3.tar.gz b/derpconf-0.8.3.tar.gz deleted file mode 100644 index 1029191..0000000 --- a/derpconf-0.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:942f109aea2fa993ccbd8dcb8a7adfc788e4b8bcd4fd1e9d39b5059756952611 -size 10252 diff --git a/python-derpconf-no-six.patch b/python-derpconf-no-six.patch index d3ac5bb..16ad38b 100644 --- a/python-derpconf-no-six.patch +++ b/python-derpconf-no-six.patch @@ -1,55 +1,34 @@ -Index: derpconf-0.8.3/debian/control +Index: derpconf-0.8.4/derpconf/config.py =================================================================== ---- derpconf-0.8.3.orig/debian/control -+++ derpconf-0.8.3/debian/control -@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9), - python-coverage, - python-colorama, - python-tox, -- python-six - X-Python-Version: >= 2.6 - Homepage: https://github.com/globocom/derpconf - Vcs-Git: git://github.com/globocom/derpconf.git -@@ -21,7 +20,7 @@ Vcs-Browser: https://github.com/globocom - - Package: python-derpconf - Architecture: all --Depends: ${misc:Depends}, ${python:Depends}, python-six -+Depends: ${misc:Depends}, ${python:Depends} - Provides: ${python:Provides} - Description: Python module to abstract loading configuration files for your app - Abstracts loading configuration files for your app. -Index: derpconf-0.8.3/derpconf/config.py -=================================================================== ---- derpconf-0.8.3.orig/derpconf/config.py -+++ derpconf-0.8.3/derpconf/config.py +--- derpconf-0.8.4.orig/derpconf/config.py ++++ derpconf-0.8.4/derpconf/config.py @@ -15,7 +15,6 @@ from collections import defaultdict from os.path import join, exists, abspath, dirname, isdir - import imp + import importlib -import six from textwrap import fill -@@ -96,7 +95,7 @@ class Config(object): - code = config_file.read() - module = imp.new_module(name) +@@ -97,7 +96,7 @@ class Config(object): + spec = importlib._bootstrap.ModuleSpec(name, None) + module = importlib.util.module_from_spec(spec) - six.exec_(code, module.__dict__) + exec(code, module.__dict__) conf.config_file = path -@@ -120,7 +119,7 @@ class Config(object): - code = config_file.read() - module = imp.new_module(name) +@@ -122,7 +121,7 @@ class Config(object): + spec = importlib._bootstrap.ModuleSpec(name, None) + module = importlib.util.module_from_spec(spec) - six.exec_(code, module.__dict__) + exec(code, module.__dict__) conf = cls(defaults=[]) -@@ -310,7 +309,7 @@ def format_tuple(value, tabs=0): +@@ -312,7 +311,7 @@ def format_tuple(value, tabs=0): def format_value(value): @@ -58,19 +37,19 @@ Index: derpconf-0.8.3/derpconf/config.py return "'%s'" % value if isinstance(value, (tuple, list, set)): -Index: derpconf-0.8.3/requirements.txt +Index: derpconf-0.8.4/requirements.txt =================================================================== ---- derpconf-0.8.3.orig/requirements.txt -+++ derpconf-0.8.3/requirements.txt +--- derpconf-0.8.4.orig/requirements.txt ++++ derpconf-0.8.4/requirements.txt @@ -3,4 +3,3 @@ pyVows coverage colorama tox -six -Index: derpconf-0.8.3/setup.py +Index: derpconf-0.8.4/setup.py =================================================================== ---- derpconf-0.8.3.orig/setup.py -+++ derpconf-0.8.3/setup.py +--- derpconf-0.8.4.orig/setup.py ++++ derpconf-0.8.4/setup.py @@ -18,7 +18,6 @@ tests_require = [ 'coverage', 'colorama', @@ -79,7 +58,7 @@ Index: derpconf-0.8.3/setup.py ] -@@ -47,7 +46,6 @@ def run_setup(extension_modules=[]): +@@ -50,7 +49,6 @@ def run_setup(extension_modules=[]): packages=['derpconf'], package_dir={"derpconf": "derpconf"}, install_requires=[ @@ -87,10 +66,10 @@ Index: derpconf-0.8.3/setup.py ], extras_require={ -Index: derpconf-0.8.3/tox.ini +Index: derpconf-0.8.4/tox.ini =================================================================== ---- derpconf-0.8.3.orig/tox.ini -+++ derpconf-0.8.3/tox.ini +--- derpconf-0.8.4.orig/tox.ini ++++ derpconf-0.8.4/tox.ini @@ -13,4 +13,3 @@ deps = pyVows coverage diff --git a/python-derpconf.changes b/python-derpconf.changes index a9ba32a..2a908f6 100644 --- a/python-derpconf.changes +++ b/python-derpconf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 14 17:46:42 UTC 2024 - Dirk Müller + +- update to 0.8.4: + * Replaced travis com github actions and Python 3.12 support + ------------------------------------------------------------------- Thu May 11 08:28:51 UTC 2023 - pgajdos@suse.com diff --git a/python-derpconf.spec b/python-derpconf.spec index 036f3c0..fcd2c42 100644 --- a/python-derpconf.spec +++ b/python-derpconf.spec @@ -1,7 +1,7 @@ # # spec file for package python-derpconf # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: python-derpconf -Version: 0.8.3 +Version: 0.8.4 Release: 0 Summary: Configuration file loader License: MIT Group: Development/Languages/Python URL: https://github.com/globocom/derpconf -Source: https://github.com/globocom/derpconf/archive/v%{version}.tar.gz#/derpconf-%{version}.tar.gz +Source: https://github.com/globocom/derpconf/archive/refs/tags/%{version}.tar.gz # https://github.com/globocom/derpconf/issues/26 Patch0: python-derpconf-no-six.patch BuildRequires: %{python_module pyVows}