Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-derpconf for openSUSE:Factory
checked in at 2024-01-15 22:17:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-derpconf (Old)
and /work/SRC/openSUSE:Factory/.python-derpconf.new.21961 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-derpconf"
Mon Jan 15 22:17:47 2024 rev:3 rq:1138699 version:0.8.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-derpconf/python-derpconf.changes
2023-05-11 12:35:00.395151403 +0200
+++
/work/SRC/openSUSE:Factory/.python-derpconf.new.21961/python-derpconf.changes
2024-01-15 22:19:11.198750593 +0100
@@ -1,0 +2,6 @@
+Sun Jan 14 17:46:42 UTC 2024 - Dirk Müller <[email protected]>
+
+- update to 0.8.4:
+ * Replaced travis com github actions and Python 3.12 support
+
+-------------------------------------------------------------------
Old:
----
derpconf-0.8.3.tar.gz
New:
----
0.8.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-derpconf.spec ++++++
--- /var/tmp/diff_new_pack.qPczJa/_old 2024-01-15 22:19:12.446796460 +0100
+++ /var/tmp/diff_new_pack.qPczJa/_new 2024-01-15 22:19:12.462797048 +0100
@@ -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}
++++++ derpconf-0.8.3.tar.gz -> 0.8.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/.github/workflows/test.yml
new/derpconf-0.8.4/.github/workflows/test.yml
--- old/derpconf-0.8.3/.github/workflows/test.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/derpconf-0.8.4/.github/workflows/test.yml 2023-10-11
20:56:23.000000000 +0200
@@ -0,0 +1,25 @@
+name: unittests
+on:
+ push:
+ pull_request:
+ types: [opened, reopened]
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ python-version: ['3.9', '3.10', '3.11', '3.12']
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up Python
+ id: setup-python
+ uses: actions/setup-python@v3
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install dependencies
+ run: |
+ sudo apt-get install -y librtmp-dev libevent-dev
+ python -m pip install --upgrade pip
+ make setup
+ - name: Test with pyvows
+ run: make test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/.travis.yml
new/derpconf-0.8.4/.travis.yml
--- old/derpconf-0.8.3/.travis.yml 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-language: python
-python:
- - 2.7
-
-install:
- - sudo apt-get install -y librtmp-dev libevent-dev
- - make setup
-
-script:
- - make test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/README.md new/derpconf-0.8.4/README.md
--- old/derpconf-0.8.3/README.md 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/README.md 2023-10-11 20:56:23.000000000 +0200
@@ -1,123 +1,135 @@
-derpconf
-========
-
-[](http://travis-ci.org/globocom/derpconf)
+# derpconf
derpconf abstracts loading configuration files for your app. derpconf was
extracted from [thumbor](http://github.com/globocom/thumbor/).
-Intalling
----------
+## Intalling
Installing derpconf is as easy as:
- pip install derpconf
+```
+pip install derpconf
+```
-Usage
------
+## Usage
Using it is as simple as:
- from derpconf.config import Config
+```python
+from derpconf.config import Config
- conf = Config.load('/path/to/my/cfg.conf')
+conf = Config.load('/path/to/my/cfg.conf')
- assert conf.MY_KEY == 'MY_VALUE' # assuming there's a key called MY_KEY in
- # the configuration file.
+assert conf.MY_KEY == 'MY_VALUE' # assuming there's a key called MY_KEY in
+ # the configuration file.
+```
-Settings Defaults
------------------
+## Settings Defaults
If you want to set default values for your configurations, just call:
- Config.define('MY-KEY', 'DEFAULT VALUE', 'Description for my key',
'Section')
+```python
+Config.define('MY-KEY', 'DEFAULT VALUE', 'Description for my key', 'Section')
+```
The values that define gets are:
* the configuration key;
* the default value for that key if it's not found in the configuration file;
* the description for this key. This is very useful for generating
-configuration file examples.
+ configuration file examples.
* the section that this key belongs to. Again very useful for generating
-configuration file examples.
+ configuration file examples.
-Using Environment Variables
----------------------------
+## Using Environment Variables
-If you wish to allow environment variables to be used as the value of
configuration keys, just call the `allow_environment_variables` method in your
`config.py` file:
+If you wish to allow environment variables to be used as the value of
+configuration keys, just call the `allow_environment_variables` method in your
+`config.py` file:
- from derpconf.config import Config
+```python
+from derpconf.config import Config
- Config.allow_environment_variables()
+Config.allow_environment_variables()
+```
-If there's an environment variable with the same name as the given
configuration, derpconf will give precedence to it, instead of using the
default value or the value in the configuration file.
+If there's an environment variable with the same name as the given
+configuration, derpconf will give precedence to it, instead of using the
+default value or the value in the configuration file.
- # called program with SOMETHING=value myprogram.py
- assert config.SOMETHING == "value"
+```python
+# called program with SOMETHING=value myprogram.py
+assert config.SOMETHING == "value"
- # even if the default for 'SOMETHING' or the value in the config file is
different from 'value'
+# even if the default for 'SOMETHING' or the value in the config file is
different from 'value'
+```
-Reloading Configurations
-------------------------
+## Reloading Configurations
-After you've loaded configurations from a file, sometimes it's needed to have
them reloaded. This is the case when a new module needs to define some new
default values.
+After you've loaded configurations from a file, sometimes it's needed to have
+them reloaded. This is the case when a new module needs to define some new
+default values.
In order to reload values from a config object, just call `reload` on it:
- from derpconf.config import Config
+```python
+from derpconf.config import Config
- conf = Config.load('/path/to/my/cfg.conf')
+conf = Config.load('/path/to/my/cfg.conf')
- # then later on...
+# then later on...
- Config.define('SOMENEWFOO', 'bar', 'baz', 'foo')
+Config.define('SOMENEWFOO', 'bar', 'baz', 'foo')
- conf.reload()
- assert conf.SOMENEWFOO == 'bar'
+conf.reload()
+assert conf.SOMENEWFOO == 'bar'
+```
-Generating Configuration Examples
----------------------------------
+## Generating Configuration Examples
To generate a configuration example, you just need to call the
`get_config_text` method. Let's see an example:
- from derpconf.config import Config
-
- Config.define('foo', 'fooval', 'Foo is always a foo', 'FooValues')
- Config.define('bar', 'barval', 'Bar is not always a bar', 'BarValues')
- Config.define('baz', 'bazval', 'Baz is never a bar', 'BarValues')
+```python
+from derpconf.config import Config
- config_sample = Config.get_config_text()
- print config_sample # or instead of both, just call generate_config()
+Config.define('foo', 'fooval', 'Foo is always a foo', 'FooValues')
+Config.define('bar', 'barval', 'Bar is not always a bar', 'BarValues')
+Config.define('baz', 'bazval', 'Baz is never a bar', 'BarValues')
+
+config_sample = Config.get_config_text()
+print config_sample # or instead of both, just call generate_config()
+```
The following text will be print into the standard output:
- ################################## FooValues
###################################
+```python
+################################## FooValues
###################################
- ## Foo is always a foo
- ## Defaults to: fooval
- #foo = 'fooval'
+## Foo is always a foo
+## Defaults to: fooval
+#foo = 'fooval'
-
################################################################################
+################################################################################
- ################################## BarValues
###################################
+################################## BarValues
###################################
- ## Bar is not always a bar
- ## Defaults to: barval
- #bar = 'barval'
+## Bar is not always a bar
+## Defaults to: barval
+#bar = 'barval'
- ## Baz is never a bar
- ## Defaults to: bazval
- #baz = 'bazval'
+## Baz is never a bar
+## Defaults to: bazval
+#baz = 'bazval'
-
################################################################################
+################################################################################
+```
A good sample of using derpconf can be seen at [thumbor's configuration
file](https://github.com/globocom/thumbor/blob/master/thumbor/config.py).
-Verifying a Configuration File
-------------------------------
+## Verifying a Configuration File
derpconf includes a configuration file verifier. The purpose of this verifier
is to help you quickly understand what configuration files are missing what
@@ -126,22 +138,27 @@
Running it is as simple as including a call to `verify_config` in your
`config.py` file:
- verify_config(file_path)
+```python
+verify_config(file_path)
+```
Or you can leave it blank and derpconf will get the file path from `sys.argv`:
- verify_config()
+```python
+verify_config()
+```
The output of the verifier is something like this:
- Configuration "baz" not found in file
/Users/bernardo/dev/derpconf/vows/fixtures/missing.conf. Using "bazval" instead.
- Configuration "foo" not found in file
/Users/bernardo/dev/derpconf/vows/fixtures/missing.conf. Using "fooval" instead.
- Configuration "bar" not found in file
/Users/bernardo/dev/derpconf/vows/fixtures/missing.conf. Using "barval" instead.
+```python
+Configuration "baz" not found in file
/Users/bernardo/dev/derpconf/vows/fixtures/missing.conf. Using "bazval" instead.
+Configuration "foo" not found in file
/Users/bernardo/dev/derpconf/vows/fixtures/missing.conf. Using "fooval" instead.
+Configuration "bar" not found in file
/Users/bernardo/dev/derpconf/vows/fixtures/missing.conf. Using "barval" instead.
+```
You can see it in use at [derpconf's
code](https://github.com/globocom/derpconf/blob/master/derpconf/config.py).
-License
--------
+## License
derpconf is licensed under the MIT License:
@@ -149,8 +166,20 @@
Copyright (c) 2012 globo.com [email protected]
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/debian/changelog
new/derpconf-0.8.4/debian/changelog
--- old/derpconf-0.8.3/debian/changelog 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/debian/changelog 1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
-derpconf (0.8.2-1) unstable; urgency=medium
-
- * New upstream release
-
- -- Marcelo Jorge Vieira <[email protected]> Thu, 11 Jan 2018 22:13:34 -0200
-
-derpconf (0.8.1-1) unstable; urgency=medium
-
- * New upstream release
- * Fixed package-uses-deprecated-debhelper-compat-version
- * Bumped standards version to 4.0.0 (no changes)
-
- -- Marcelo Jorge Vieira <[email protected]> Sun, 27 Aug 2017 16:01:40 -0300
-
-derpconf (0.8.0-1~bpo8+1) jessie-backports; urgency=medium
-
- * Rebuild for jessie-backports.
-
- -- Gilles Dubuc <[email protected]> Fri, 17 Jun 2016 11:55:15 +0000
-
-derpconf (0.8.0-1) unstable; urgency=medium
-
- * New upstream release
-
- -- Gilles Dubuc <[email protected]> Thu, 16 Jun 2016 16:26:41 +0000
-
-derpconf (0.7.3-1) unstable; urgency=low
-
- * New upstream release (Closes: #774656)
- * Updated Standards-Version to 3.9.6 (no changes)
- * Added watch file
- * Rules:
- + build with buildsystem=python_distutils
- + Added override_dh_auto_test target
- + Added get-orig-source target
- + Added override_dh_clean target
- * Control:
- + Fixed build-depends
- + Added me as Maintainer
- + Updating long description
- * Updating debian copyright
-
- -- Marcelo Jorge Vieira <[email protected]> Mon, 06 Apr 2015 23:37:14 -0300
-
-derpconf (0.4.9-2) UNRELEASED; urgency=low
-
- * Added docs file
-
- -- Marcelo Jorge Vieira (metal) <[email protected]> Wed, 20 Nov 2013 21:18:47
-0200
-
-derpconf (0.4.9-1) UNRELEASED; urgency=low
-
- * New release 0.4.9;
- * Fixed python-six dependency;
- * Fixed python support;
- * Minimizing rules file;
- * Improving package description;
- * Refactoring Maintainer field; Now globo.com is the Maintainer
- and I and Wichert as uploaders;
- * Switch to dpkg-source 3.0 (quilt) format;
- * Convert copyright file to machine readable specification;
- * Fixed debhelper compatibility level;
- * Updated Standards-Version to 3.9.4 (no changes).
-
- -- Marcelo Jorge Vieira (metal) <[email protected]> Wed, 20 Nov 2013 19:23:15
-0200
-
-derpconf (0.3.3ubuntu1) UNRELEASED; urgency=low
-
- * Fixes on rules file - missing python libs after install package
-
- -- Paulo Sousa <[email protected]> Wed, 16 Jan 2013 18:24:36 -0200
-
-derpconf (0.3.3) UNRELEASED; urgency=low
-
- * New release 0.3.3
-
- -- Paulo Sousa <[email protected]> Wed, 16 Jan 2013 14:29:45 -0200
-
-derpconf (0.3.0-1) UNRELEASED; urgency=low
-
- * First packaging
-
- -- Wichert Akkerman <[email protected]> Tue, 25 Sep 2012 10:04:40 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/debian/compat
new/derpconf-0.8.4/debian/compat
--- old/derpconf-0.8.3/debian/compat 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/debian/control
new/derpconf-0.8.4/debian/control
--- old/derpconf-0.8.3/debian/control 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/debian/control 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-Source: derpconf
-Maintainer: Marcelo Jorge Vieira <[email protected]>
-Uploaders: Gilles Dubuc <[email protected]>
-Section: python
-Priority: optional
-Standards-Version: 4.0.0
-Build-Depends: debhelper (>= 9),
- python-setuptools (>= 0.6b3),
- python-all (>= 2.6.6-3),
- dh-python,
- python-pyvows,
- python-gevent,
- 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
-Vcs-Browser: https://github.com/globocom/derpconf
-
-Package: python-derpconf
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-six
-Provides: ${python:Provides}
-Description: Python module to abstract loading configuration files for your app
- Abstracts loading configuration files for your app.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/debian/copyright
new/derpconf-0.8.4/debian/copyright
--- old/derpconf-0.8.3/debian/copyright 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/debian/copyright 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: derpconf
-Source: https://github.com/globocom/derpconf
-
-Files: *
-Copyright: 2011-2015 globo.com <[email protected]>
-License: MIT
-
-Files: debian/*
-Copyright: 2011-2015 globo.com <[email protected]>,
- 2014-2015 Marcelo Jorge Vieira <[email protected]>
-License: MIT
-
-License: MIT
- Copyright (c) 2011-2015 globo.com <[email protected]>
- .
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
all
- copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/debian/docs
new/derpconf-0.8.4/debian/docs
--- old/derpconf-0.8.3/debian/docs 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/debian/docs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/debian/rules
new/derpconf-0.8.4/debian/rules
--- old/derpconf-0.8.3/debian/rules 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/debian/rules 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-#!/usr/bin/make -f
-%:
- dh $@ --with python2 --buildsystem=python_distutils
-
-override_dh_auto_test:
- $(MAKE) test
-
-override_dh_clean:
- rm -rf derpconf.egg-info
- dh_clean
-
-get-orig-source:
- OUTDIR=$$PWD ; \
- MAKEFILE=`echo $(MAKEFILE_LIST) | awk '{ print $$1 }'` ; \
- FILE=`readlink -f $$MAKEFILE` ; \
- DIR=`dirname $$FILE` ; \
- cd $$DIR/.. ; \
- TMP=`mktemp -d` ; \
- if ! USCAN=`uscan --no-symlink --destdir $$TMP` ; then exit 1 ; fi ; \
- VERSION=`echo $$USCAN | sed -n 's/.*Newer version (\(.*\))
available.*/\1/p'` ; \
- cd $$TMP ; \
- tar xzf derpconf-$$VERSION.tar.gz ; \
- cd derpconf-$$VERSION ; \
- rm -rf debian ; \
- cd .. ; \
- tar c derpconf-$$VERSION | gzip -9 > derpconf_$$VERSION.orig.tar.gz ; \
- rm -rf derpconf-$$VERSION ; \
- mv derpconf_$$VERSION.orig.tar.gz $$OUTDIR ; \
- cd $$OUTDIR ; \
- rm -rf $$TMP ; \
- echo Saved file at derpconf_$$VERSION.orig.tar.gz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/debian/source/format
new/derpconf-0.8.4/debian/source/format
--- old/derpconf-0.8.3/debian/source/format 2019-01-21 03:10:27.000000000
+0100
+++ new/derpconf-0.8.4/debian/source/format 1970-01-01 01:00:00.000000000
+0100
@@ -1 +0,0 @@
-3.0 (quilt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/debian/watch
new/derpconf-0.8.4/debian/watch
--- old/derpconf-0.8.3/debian/watch 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/debian/watch 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-version=3
-opts="filenamemangle=s/.+\/v?(.*)\.tar\.gz/derpconf-$1.tar.gz/" \
- https://github.com/globocom/derpconf/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/derpconf/config.py
new/derpconf-0.8.4/derpconf/config.py
--- old/derpconf-0.8.3/derpconf/config.py 2019-01-21 03:10:27.000000000
+0100
+++ new/derpconf-0.8.4/derpconf/config.py 2023-10-11 20:56:23.000000000
+0200
@@ -13,7 +13,7 @@
import logging
from collections import defaultdict
from os.path import join, exists, abspath, dirname, isdir
-import imp
+import importlib
import six
from textwrap import fill
@@ -94,7 +94,8 @@
with open(path) as config_file:
name = 'configuration'
code = config_file.read()
- module = imp.new_module(name)
+ spec = importlib._bootstrap.ModuleSpec(name, None)
+ module = importlib.util.module_from_spec(spec)
six.exec_(code, module.__dict__)
@@ -118,7 +119,8 @@
with open(path) as config_file:
name = 'configuration'
code = config_file.read()
- module = imp.new_module(name)
+ spec = importlib._bootstrap.ModuleSpec(name, None)
+ module = importlib.util.module_from_spec(spec)
six.exec_(code, module.__dict__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/derpconf/version.py
new/derpconf-0.8.4/derpconf/version.py
--- old/derpconf-0.8.3/derpconf/version.py 2019-01-21 03:10:27.000000000
+0100
+++ new/derpconf-0.8.4/derpconf/version.py 2023-10-11 20:56:23.000000000
+0200
@@ -8,4 +8,4 @@
# http://www.opensource.org/licenses/mit-license
# Copyright (c) 2012 globo.com [email protected]
-__version__ = "0.8.3"
+__version__ = "0.8.4"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/derpconf-0.8.3/setup.py new/derpconf-0.8.4/setup.py
--- old/derpconf-0.8.3/setup.py 2019-01-21 03:10:27.000000000 +0100
+++ new/derpconf-0.8.4/setup.py 2023-10-11 20:56:23.000000000 +0200
@@ -42,7 +42,10 @@
'Natural Language :: English',
'Operating System :: MacOS',
'Operating System :: POSIX :: Linux',
- 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3.9',
+ 'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
+ 'Programming Language :: Python :: 3.12',
],
packages=['derpconf'],
package_dir={"derpconf": "derpconf"},
++++++ python-derpconf-no-six.patch ++++++
--- /var/tmp/diff_new_pack.qPczJa/_old 2024-01-15 22:19:13.162822775 +0100
+++ /var/tmp/diff_new_pack.qPczJa/_new 2024-01-15 22:19:13.198824098 +0100
@@ -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 @@
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 @@
]
-@@ -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 @@
],
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
