From ba3d5c9037548c0cbfe5c877197af6a14f77ca0b Mon Sep 17 00:00:00 2001 From: Pier Carlo Chiodi Date: Thu, 16 Feb 2017 18:30:16 +0100 Subject: [PATCH] 0.3.0a4 --- CHANGES.rst | 5 +++++ LICENSE | 2 +- pierky/__init__.py | 3 +++ pierky/p2es/__init__.py | 2 ++ pierky/p2es/errors.py | 3 +++ pierky/p2es/es.py | 3 +++ pierky/p2es/readers.py | 3 +++ pierky/p2es/threads.py | 3 +++ pierky/p2es/transformations.py | 3 +++ pierky/p2es/version.py | 5 ++++- pierky/p2es/writers.py | 3 +++ scripts/pmacct-to-elasticsearch | 5 ++++- 12 files changed, 37 insertions(+), 3 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 6417484..90aa4cd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,11 @@ Changelog ========= +0.3.0a4 +------- + +- Fix an issue with transformations. + 0.3.0a3 ------- diff --git a/LICENSE b/LICENSE index 28e0147..f40dfd4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014 Pier Carlo Chiodi +Copyright (c) 2014-2017 Pier Carlo Chiodi Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/pierky/__init__.py b/pierky/__init__.py index d407605..46395f6 100644 --- a/pierky/__init__.py +++ b/pierky/__init__.py @@ -1,3 +1,6 @@ +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + try: __import__('pkg_resources').declare_namespace(__name__) except ImportError: diff --git a/pierky/p2es/__init__.py b/pierky/p2es/__init__.py index e69de29..6e01b7b 100644 --- a/pierky/p2es/__init__.py +++ b/pierky/p2es/__init__.py @@ -0,0 +1,2 @@ +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. diff --git a/pierky/p2es/errors.py b/pierky/p2es/errors.py index fc85027..ea7e2f1 100644 --- a/pierky/p2es/errors.py +++ b/pierky/p2es/errors.py @@ -1,2 +1,5 @@ +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + class P2ESError(Exception): pass diff --git a/pierky/p2es/es.py b/pierky/p2es/es.py index ddb474f..dd0494e 100644 --- a/pierky/p2es/es.py +++ b/pierky/p2es/es.py @@ -1,3 +1,6 @@ +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + import json import urllib2 diff --git a/pierky/p2es/readers.py b/pierky/p2es/readers.py index f6f4ed8..e186b22 100644 --- a/pierky/p2es/readers.py +++ b/pierky/p2es/readers.py @@ -1,3 +1,6 @@ +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + import json try: from queue import Queue, Empty diff --git a/pierky/p2es/threads.py b/pierky/p2es/threads.py index f9f59f2..8668900 100644 --- a/pierky/p2es/threads.py +++ b/pierky/p2es/threads.py @@ -1,3 +1,6 @@ +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + import threading class P2ESThread(threading.Thread): diff --git a/pierky/p2es/transformations.py b/pierky/p2es/transformations.py index 4132b15..b96a799 100644 --- a/pierky/p2es/transformations.py +++ b/pierky/p2es/transformations.py @@ -1,3 +1,6 @@ +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + # See TRANSFORMATIONS.md file for details import json diff --git a/pierky/p2es/version.py b/pierky/p2es/version.py index 4fae70c..b8dc8e0 100644 --- a/pierky/p2es/version.py +++ b/pierky/p2es/version.py @@ -1 +1,4 @@ -__version__ = "0.3.0a3" +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + +__version__ = "0.3.0a4" diff --git a/pierky/p2es/writers.py b/pierky/p2es/writers.py index a312f84..7ef3c22 100644 --- a/pierky/p2es/writers.py +++ b/pierky/p2es/writers.py @@ -1,3 +1,6 @@ +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + import datetime import json try: diff --git a/scripts/pmacct-to-elasticsearch b/scripts/pmacct-to-elasticsearch index 6fbddff..a992b61 100755 --- a/scripts/pmacct-to-elasticsearch +++ b/scripts/pmacct-to-elasticsearch @@ -1,5 +1,8 @@ #!/usr/bin/env python +# This code is Copyright 2014-2017 by Pier Carlo Chiodi. +# See full license in LICENSE file. + import argparse from copy import deepcopy import datetime @@ -236,7 +239,7 @@ def main(): description="pmacct-to-elasticsearch {}: a tool to read " "pmacct's output and to store it into " "ElasticSearch.".format(CURRENT_RELEASE), - epilog="Copyright (c) {} - Pier Carlo Chiodi - " + epilog="Copyright (c) 2014-{} - Pier Carlo Chiodi - " "https://pierky.com".format(2017) ) parser.add_argument(