Skip to content
This repository was archived by the owner on Sep 29, 2023. It is now read-only.

Commit a51ebb1

Browse files
author
Christian Jurk
committed
Fixed issue with HAVE_RRD_GRAPH
1 parent a89d149 commit a51ebb1

File tree

4 files changed

+8
-51
lines changed

4 files changed

+8
-51
lines changed

ACKNOWLEDGEMENT

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ This is a list of people who have made contributions to this project.
22

33
Hye-Shik Chang <perky@FreeBSD.org>
44
Matthew W. Samsonoff <mws@rochester.rr.com>
5-
Brian E. Gallew <geek+python@cmu.edu>
5+
Brian E. Gallew <geek+python@cmu.edu>
6+
Michael Tremer <michael@tremer.co.uk>

README.md

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -31,46 +31,3 @@ rrdtool.create('test.rrd', '--start', 'now', '--step', '300', 'RRA:AVERAGE:0.5:1
3131
rrdtool.update('test.rrd', 'N:32')
3232
```
3333

34-
Changes
35-
-------
36-
37-
38-
## 0.1.2
39-
40-
*Released 2015-08-10*
41-
42-
* Added xport command
43-
* Added lastupdate command
44-
* Removed high-level interface (RRDtool module)
45-
* Improved documentation of functions
46-
* Code cleanup by using convenience macros
47-
* On Python 2.x, str objects are returned instead of unicode objects
48-
* Merged some changes from upstream
49-
* License changed to LGPL 2.1 to match upstream licensing
50-
51-
## 0.1.1
52-
53-
*Released 2013-12-19*
54-
55-
* Added support for Python 2.7 (other 2.x versions might also work, but its not tested)
56-
* Added dump command
57-
* Fixed some issues regarding generating graphs with `graphv` on Python 3.3
58-
59-
*Please note:* The `graph` method in the object-oriented RRD class will now return a dict by default (as returned by graphv). Only if the `output_file` parameter is None, the actual graph image bytes are returned. Python 3.3 will return a bytes object whereas Python 2.x will return a str object.
60-
61-
## 0.1.0
62-
63-
*Released 2012-09-17*
64-
65-
* Initial release.
66-
* Support for Python 3.x added
67-
* Updated documentation strings (`__doc__`) for each of the rrdtool functions
68-
69-
Author
70-
------
71-
72-
Christian Jurk <commx@commx.ws>
73-
74-
This binding was created because I am currently porting some existing Python 2 code to Python 3 and try to help the community by contributing a updated binding extension. Hope someone can benefit from it.
75-
76-
If you encounter any bugs (which I expected at time of writing this), please submit them in the issue tracker here on the project page on Github. Thank you.

rrdtoolmodule.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#endif
4646

4747
/** Binding version. */
48-
static const char *_version = "0.1.2";
48+
static const char *_version = "0.1.3";
4949

5050
/** Exception types. */
5151
static PyObject *rrdtool_OperationalError;
@@ -428,7 +428,6 @@ _rrdtool_flushcached(PyObject *self, PyObject *args)
428428
return ret;
429429
}
430430

431-
#ifdef HAVE_RRD_GRAPH
432431
static char _rrdtool_graph__doc__[] = "Create a graph based on one or more " \
433432
"RRDs.\n\n\
434433
Usage: graph(args..)\n\
@@ -665,7 +664,6 @@ _rrdtool_xport(PyObject *self, PyObject *args)
665664

666665
return ret;
667666
}
668-
#endif /* HAVE_RRD_GRAPH */
669667

670668
static char _rrdtool_tune__doc__[] = "Modify some basic properties of a " \
671669
"Round Robin Database.\n\n\

setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
except ImportError:
55
from distutils.core import setup, Extension
66

7+
78
def main():
89
module = Extension('rrdtool',
910
sources=['rrdtoolmodule.c'],
10-
include_dirs = ['/opt/local/include'],
11+
include_dirs=['/opt/local/include'],
1112
libraries=['rrd'])
1213

1314
kwargs = dict(
14-
name='python-rrdtool',
15-
version='0.1.2',
15+
name='rrdtool',
16+
version='0.1.3',
1617
description='rrdtool bindings for Python',
1718
keywords=['rrdtool'],
1819
author='Christian Jurk, Hye-Shik Chang',
1920
author_email='commx@commx.ws',
20-
license='GPL',
21+
license='LGPL',
2122
url='https://github.com/commx/python-rrdtool',
2223
ext_modules=[module],
2324
)

0 commit comments

Comments
 (0)