Hello community, here is the log from the commit of package python-rrdtool for openSUSE:Factory checked in at 2019-05-27 08:38:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rrdtool (Old) and /work/SRC/openSUSE:Factory/.python-rrdtool.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-rrdtool" Mon May 27 08:38:58 2019 rev:2 rq:705385 version:0.1.15 Changes: -------- --- /work/SRC/openSUSE:Factory/python-rrdtool/python-rrdtool.changes 2019-05-16 22:09:33.934308515 +0200 +++ /work/SRC/openSUSE:Factory/.python-rrdtool.new.5148/python-rrdtool.changes 2019-05-27 08:39:14.547050927 +0200 @@ -1,0 +2,6 @@ +Sat May 25 08:38:54 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> + +- Update to 0.1.15: + * no upstream changelog provided + +------------------------------------------------------------------- Old: ---- v0.1.14.tar.gz New: ---- v0.1.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rrdtool.spec ++++++ --- /var/tmp/diff_new_pack.pZkGZU/_old 2019-05-27 08:39:16.803050048 +0200 +++ /var/tmp/diff_new_pack.pZkGZU/_new 2019-05-27 08:39:16.807050046 +0200 @@ -18,7 +18,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-rrdtool -Version: 0.1.14 +Version: 0.1.15 Release: 0 Summary: Python bindings for rrdtool License: LGPL-2.1-or-later ++++++ v0.1.14.tar.gz -> v0.1.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/.editorconfig new/python-rrdtool-0.1.15/.editorconfig --- old/python-rrdtool-0.1.14/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/python-rrdtool-0.1.15/.editorconfig 2019-05-17 14:18:18.000000000 +0200 @@ -0,0 +1,13 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true + +[*.py] +indent_style = space +indent_size = 4 + +[{*.c,*.h}] +indent_style = space +indent_size = 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/.github/ISSUE_TEMPLATE/bug_report.md new/python-rrdtool-0.1.15/.github/ISSUE_TEMPLATE/bug_report.md --- old/python-rrdtool-0.1.14/.github/ISSUE_TEMPLATE/bug_report.md 1970-01-01 01:00:00.000000000 +0100 +++ new/python-rrdtool-0.1.15/.github/ISSUE_TEMPLATE/bug_report.md 2019-05-17 14:18:18.000000000 +0200 @@ -0,0 +1,29 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: + + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots and/or console outputs to help explain your problem. + +**Desktop (please complete the following information):** + - Python version: + - RRDtool version: + - python-rrdtool version: + +**Additional context** +Add any other context about the problem here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/.travis.yml new/python-rrdtool-0.1.15/.travis.yml --- old/python-rrdtool-0.1.14/.travis.yml 2018-04-26 15:40:54.000000000 +0200 +++ new/python-rrdtool-0.1.15/.travis.yml 2019-05-17 14:18:18.000000000 +0200 @@ -1,13 +1,12 @@ -dist: trusty +dist: xenial language: python sudo: required python: - - "2.6" - "2.7" - - "3.3" - "3.4" - "3.5" - "3.6" + - "3.7" before_install: - sudo apt-get -qq update - sudo apt-get install -y librrd-dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/README.md new/python-rrdtool-0.1.15/README.md --- old/python-rrdtool-0.1.14/README.md 2018-04-26 15:40:54.000000000 +0200 +++ new/python-rrdtool-0.1.15/README.md 2019-05-17 14:18:18.000000000 +0200 @@ -1,29 +1,29 @@ [](https://travis-ci.org/commx/python-rrdtool) -python-rrdtool -============== +# python-rrdtool -Python bindings for [RRDtool](http://oss.oetiker.ch/rrdtool) with a native C extension. +Python bindings for [RRDtool](https://oss.oetiker.ch/rrdtool) for Python 2 and 3. -Supported Python versions: 2.6+, 3.3+. +The bindings are based on the code of the original Python 2 bindings module for rrdtool by Hye-Shik Chang and are now shipped with the RRDtool distribution. This project is maintained separately to provide a more pythonic way to install those bindings via [PyPI](https://pypi.org). -The bindings are based on the code of the original Python 2 bindings for rrdtool by Hye-Shik Chang, which are currently shipped as official bindings with rrdtool. +## Features -**Note:** python-rrdtool is now the official rrdtool Python binding and shipped with the upstream distribution. +* Native extension (written in C) for performance reasons. +* Uses library functions as exposed by librrd. +* Works with Python 2.6, 2.7, 3.3 and any later version. -Installation ------------- -The easy way: +## Installation - # pip install rrdtool +The most convenient way to install (on POSIX-like systems) is to use pip: -**Note:** This requires rrdtool and it's development files (headers, libraries, dependencies) to be installed. + pip install rrdtool -In case you'd like to build the module on your own, you can obtain a copy of the repository and run `python setup.py install` in it's destination folder to build the native C extension. +**Note:** Unless binary versions are available for your target system, the command above requires rrdtool development files (headers, libraries, dependencies) to be installed, otherwise building the module will fail. -Usage ------ +In case you'd like to build the module on your own (regardless of whether binary versions are available for your system), you can obtain a copy of the source code and run `python setup.py install` in its destination folder to build the module. + +## Usage ```python import rrdtool @@ -35,7 +35,10 @@ rrdtool.update('test.rrd', 'N:32') ``` -Documentation -------------- +## Documentation + +You can find the latest documentation for this project at https://pythonhosted.org/rrdtool. + +## License -You can find the latest documentation for this project at http://pythonhosted.org/rrdtool. +[GNU Lesser General Public License version 2.1](https://opensource.org/licenses/LGPL-2.1). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/docs/index.rst new/python-rrdtool-0.1.15/docs/index.rst --- old/python-rrdtool-0.1.14/docs/index.rst 2018-04-26 15:40:54.000000000 +0200 +++ new/python-rrdtool-0.1.15/docs/index.rst 2019-05-17 14:18:18.000000000 +0200 @@ -10,7 +10,7 @@ The bindings are a fork of the `Python bindings by Hye-Shik Chang <http://www.nongnu.org/py-rrdtool/>`_, which are currently shipped with the official rrdtool source distribution. -Tables of content +Table of contents ----------------- .. toctree:: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/docs/usage.rst new/python-rrdtool-0.1.15/docs/usage.rst --- old/python-rrdtool-0.1.14/docs/usage.rst 2018-04-26 15:40:54.000000000 +0200 +++ new/python-rrdtool-0.1.15/docs/usage.rst 2019-05-17 14:18:18.000000000 +0200 @@ -42,27 +42,27 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: None .. function:: dump(*args) - Dump an round robin database to XML. + Dump a round robin database to XML. :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: None .. function:: fetch(*args) - Fetch data from an round robin database. + Fetch data from a round robin database. :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: tuple @@ -79,7 +79,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: int @@ -89,7 +89,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: None @@ -99,7 +99,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: tuple @@ -118,7 +118,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: dict @@ -143,7 +143,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: dict @@ -175,17 +175,17 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: int .. function:: lastupdate(*args) - Returns datetme and value stored for each datum in the most recent update of an RRD. + Returns datetime and value stored for each datum in the most recent update of an RRD. :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: dict @@ -227,7 +227,7 @@ :param callable: A callable method or object :type callable: callable - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :rtype: None Example:: @@ -278,7 +278,7 @@ rrdtool.register_fetch_cb(cb) # overwrite callback rrdtool.graphv(**graphv_args) - .. note:: This function uses Python long integers on Python 2.x and 3.x to minimize compatibility code requirements (Python 3 has long integers as it's default int anyway). + .. note:: This function uses Python long integers on Python 2.x and 3.x to minimize compatibility code requirements (Python 3 has long integers as its default int anyway). .. note:: This function has been added in rrdtool 1.5.0 and may not be available if compiled against an older version. @@ -290,7 +290,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: None @@ -300,7 +300,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: None @@ -310,7 +310,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: None @@ -320,7 +320,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: dict @@ -330,7 +330,7 @@ :param args: Arguments :type args: tuple - :raises ProgrammingError: in the event of an programming error + :raises ProgrammingError: in the event of a programming error :raises OperationalError: in the event of an rrdtool error :rtype: dict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/rrdtoolmodule.c new/python-rrdtool-0.1.15/rrdtoolmodule.c --- old/python-rrdtool-0.1.14/rrdtoolmodule.c 2018-04-26 15:40:54.000000000 +0200 +++ new/python-rrdtool-0.1.15/rrdtoolmodule.c 2019-05-17 14:18:18.000000000 +0200 @@ -3,7 +3,7 @@ * Based on the rrdtool Python bindings for Python 2 from * Hye-Shik Chang <perky@fallin.lv>. * - * Copyright 2012 Christian Jurk <commx@commx.ws> + * Copyright 2012 Christian Kroeger <commx@commx.ws> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -157,13 +157,13 @@ o = PyTuple_GET_ITEM(args, i); if (PyRRD_String_Check(o)) - (*rrdtool_argv)[++argv_count] = PyRRD_String_AS_STRING(o); + (*rrdtool_argv)[++argv_count] = (char *)PyRRD_String_AS_STRING(o); else if (PyList_CheckExact(o)) { for (j = 0; j < PyList_Size(o); j++) { lo = PyList_GetItem(o, j); if (PyRRD_String_Check(lo)) - (*rrdtool_argv)[++argv_count] = PyRRD_String_AS_STRING(lo); + (*rrdtool_argv)[++argv_count] = (char *)PyRRD_String_AS_STRING(lo); else { PyMem_Del(*rrdtool_argv); PyErr_Format(PyExc_TypeError, @@ -265,7 +265,7 @@ [DS:ds-name[=mapped-ds-name[source-index]]:DST:heartbeat:min:max]\n\ [RRA:CF:xff:steps:rows]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdcreate.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdcreate.en.html"; static PyObject * _rrdtool_create(PyObject *Py_UNUSED(self), PyObject *args) @@ -304,7 +304,7 @@ file.rrd\n\ [file.xml]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrddump.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrddump.en.html"; static PyObject * _rrdtool_dump(PyObject *Py_UNUSED(self), PyObject *args) @@ -343,7 +343,7 @@ N|timestamp:value[:value...]\n\ [timestamp:value[:value...] ...]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdupdate.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdupdate.en.html"; static PyObject * _rrdtool_update(PyObject *Py_UNUSED(self), PyObject *args) @@ -417,7 +417,7 @@ [-a|--align-start]\n\ [-d|--daemon address]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdfetch.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdfetch.en.html"; static PyObject * _rrdtool_fetch(PyObject *Py_UNUSED(self), PyObject *args) @@ -495,7 +495,7 @@ filename\n\ [filename ...]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdflushcached.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdflushcached.en.html"; static PyObject * _rrdtool_flushcached(PyObject *Py_UNUSED(self), PyObject *args) @@ -587,7 +587,7 @@ CDEF:vname=RPN expression\n\ VDEF=vname:RPN expression\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html"; static PyObject * _rrdtool_graph(PyObject *Py_UNUSED(self), PyObject *args) @@ -644,7 +644,7 @@ This function works the same way as 'graph', but will return a info\n\ dictionary instead of None.\n\n\ Full documentation can be found at (graphv section):\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdgraph.en.html"; static PyObject * _rrdtool_graphv(PyObject *Py_UNUSED(self), PyObject *args) @@ -689,7 +689,7 @@ [CDEF:vname=rpn-expression]\n\ [XPORT:vname[:legend]]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdxport.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdxport.en.html"; static PyObject * _rrdtool_xport(PyObject *Py_UNUSED(self), PyObject *args) @@ -791,7 +791,7 @@ [-d|--data-source-type ds-name:DST]\n\ [-r|--data-source-rename old-name:new-name]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdtune.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdtune.en.html"; static PyObject * _rrdtool_tune(PyObject *Py_UNUSED(self), PyObject *args) @@ -829,7 +829,7 @@ [--rraindex number]\n\ [-d|--daemon address]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdfirst.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdfirst.en.html"; static PyObject * _rrdtool_first(PyObject *Py_UNUSED(self), PyObject *args) @@ -864,7 +864,7 @@ filename\n\ [-d|--daemon address]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdlast.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdlast.en.html"; static PyObject * _rrdtool_last(PyObject *Py_UNUSED(self), PyObject *args) @@ -901,7 +901,7 @@ GROW|SHRINK\n\ rows\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdlast.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdlast.en.html"; static PyObject * _rrdtool_resize(PyObject *Py_UNUSED(self), PyObject *args) @@ -939,7 +939,7 @@ [-d|--daemon address]\n\ [-F|--noflush]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdinfo.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdinfo.en.html"; static PyObject * _rrdtool_info(PyObject *Py_UNUSED(self), PyObject *args) @@ -976,7 +976,7 @@ filename\n\ [-d|--daemon address]\n\n\ Full documentation can be found at:\n\ - http://oss.oetiker.ch/rrdtool/doc/rrdlastupdate.en.html"; + https://oss.oetiker.ch/rrdtool/doc/rrdlastupdate.en.html"; static PyObject * _rrdtool_lastupdate(PyObject *Py_UNUSED(self), PyObject *args) @@ -1052,7 +1052,7 @@ #ifdef WITH_FETCH_CB -/** An Python object which will hold an callable for fetch callbacks */ +/** A Python object which will hold a callable for fetch callbacks */ static PyObject *_rrdtool_fetch_callable = NULL; static int @@ -1143,7 +1143,7 @@ rrd_set_error("expected 'start' key in callback return value to be " "of type int"); goto gil_release_err; - } else if (PyObject_RichCompareBool(tmp, tmp_min_ts, Py_EQ) || + } else if (PyObject_RichCompareBool(tmp, tmp_min_ts, Py_EQ) || PyObject_RichCompareBool(tmp, po_start, Py_LT)) { rrd_set_error("expected 'start' value in callback return dict to be " "equal or earlier than passed start timestamp"); @@ -1181,7 +1181,7 @@ unsigned int x = 0; while (PyDict_Next(tmp, &pos, &key, &value)) { - char *key_str = PyRRD_String_AS_STRING(key); + const char *key_str = PyRRD_String_AS_STRING(key); if (key_str == NULL) { rrd_set_error("key of 'data' element from callback return " @@ -1240,8 +1240,7 @@ if (exc_value != NULL) { exc_value_str = PyObject_Str(exc_value); - char *exc_str = PyRRD_String_AS_STRING(exc_value_str); - rrd_set_error(exc_str); + rrd_set_error((char *)PyRRD_String_AS_STRING(exc_value_str)); Py_DECREF(exc_value); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/rrdtoolmodule.h new/python-rrdtool-0.1.15/rrdtoolmodule.h --- old/python-rrdtool-0.1.14/rrdtoolmodule.h 2018-04-26 15:40:54.000000000 +0200 +++ new/python-rrdtool-0.1.15/rrdtoolmodule.h 2019-05-17 14:18:18.000000000 +0200 @@ -35,7 +35,7 @@ const char *filename, /* name of the rrd */ enum cf_en cf_idx, /* consolidation function */ time_t *start, - time_t *end, /* which time frame do you want ? + time_t *end, /* which time frame do you want? * will be changed to represent reality */ unsigned long *step, /* which stepsize do you want? * will be changed to represent reality */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/setup.cfg new/python-rrdtool-0.1.15/setup.cfg --- old/python-rrdtool-0.1.14/setup.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/python-rrdtool-0.1.15/setup.cfg 2019-05-17 14:18:18.000000000 +0200 @@ -0,0 +1,2 @@ +[metadata] +license_file = LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/setup.py new/python-rrdtool-0.1.15/setup.py --- old/python-rrdtool-0.1.14/setup.py 2018-04-26 15:40:54.000000000 +0200 +++ new/python-rrdtool-0.1.15/setup.py 2019-05-17 14:18:18.000000000 +0200 @@ -12,7 +12,7 @@ package_dir = os.path.abspath(os.path.dirname(__file__)) # package version -package_version = '0.1.14' +package_version = '0.1.15' def check_extensions(): @@ -108,42 +108,49 @@ libraries=libraries) except CompileError: sys.exit('Error: Unable to compile the binary module. Do you have the rrdtool header and libraries installed?') - ret = None - except LinkError as exc: - shutil.rmtree(tmp_dir) - raise # re-raise + except LinkError: + raise else: return exts # seems to be available, compile in regular way - - shutil.rmtree(tmp_dir) - return ret + finally: + shutil.rmtree(tmp_dir) def main(): + with open('README.md') as readme: + long_description = readme.read() + kwargs = dict( name='rrdtool', version=package_version, description='Python bindings for rrdtool', + long_description=long_description, + long_description_content_type='text/markdown', keywords=['rrdtool'], - author='Christian Kroeger, Hye-Shik Chang', + author='Christian Kroeger', author_email='commx@commx.ws', - license='LGPL', url='https://github.com/commx/python-rrdtool', - classifiers=['License :: OSI Approved', - 'Operating System :: POSIX', - 'Operating System :: Unix', - 'Operating System :: MacOS', - 'Programming Language :: C', - 'Programming Language :: Python', - 'Programming Language :: Python :: 2.6', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)', + 'Operating System :: POSIX', + 'Programming Language :: C', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', ], ext_modules=check_extensions(), - test_suite='tests' + test_suite='tests', + package_data={ + '': ['LICENSE'] + }, + python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, <4' ) setup(**kwargs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-rrdtool-0.1.14/tests/test_fetch_cb.py new/python-rrdtool-0.1.15/tests/test_fetch_cb.py --- old/python-rrdtool-0.1.14/tests/test_fetch_cb.py 2018-04-26 15:40:54.000000000 +0200 +++ new/python-rrdtool-0.1.15/tests/test_fetch_cb.py 2019-05-17 14:18:18.000000000 +0200 @@ -1,13 +1,12 @@ -import base64 import math -import os import rrdtool import unittest import sys class TestFetchCallback(unittest.TestCase): - def check_skip(self): + @staticmethod + def check_skip(): if not hasattr(rrdtool, 'register_fetch_cb'): if sys.version_info >= (2, 7): raise unittest.SkipTest('register_fetch_cb not available') @@ -46,7 +45,13 @@ rrdtool.register_fetch_cb(my_callback) - self.assertRaisesRegex( + # TestCase.assertRaisesRegexp was renamed in Python 3.2 + if sys.version_info >= (3, 2): + assert_raises_regex = self.assertRaisesRegex + else: + assert_raises_regex = self.assertRaisesRegexp + + assert_raises_regex( rrdtool.OperationalError, 'expected callback method to be a dict', rrdtool.graphv, @@ -81,4 +86,4 @@ if __name__ == '__main__': - unittest.main() \ No newline at end of file + unittest.main()