From 0801f261fc90fb3e155c11b30610eb52170341b2 Mon Sep 17 00:00:00 2001 From: Vinicius Arcanjo Date: Mon, 8 Aug 2022 18:47:46 -0300 Subject: [PATCH 1/4] Updated changelog.rst --- CHANGELOG.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8b634f9..da035f3 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -23,6 +23,14 @@ Fixed Security ======== +[2022.2.0] - 2022-08-08 +*********************** + +General Information +=================== +- Added unit tests and increased unit test coverage + + [2022.1.0] - 2022-02-08 *********************** From ea14815c9cdd2d713c324293d2bc087e7eb64439 Mon Sep 17 00:00:00 2001 From: Vinicius Arcanjo Date: Mon, 8 Aug 2022 18:48:28 -0300 Subject: [PATCH 2/4] Bumped 2022.2.0 --- README.rst | 2 +- kytos.json | 2 +- setup.py | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 47cecf6..35f6da7 100644 --- a/README.rst +++ b/README.rst @@ -13,7 +13,7 @@ Overview ======== -Napp responsible for providing a Generic Flow and stats +Napp responsible for providing a Generic Flow and OpenFlow stats Installing ========== diff --git a/kytos.json b/kytos.json index ae884a0..1a3e8b6 100644 --- a/kytos.json +++ b/kytos.json @@ -3,7 +3,7 @@ "username": "amlight", "name": "flow_stats", "description": "Store flow information and show statistics about them.", - "version": "2022.1.0", + "version": "2022.2.0", "napp_dependencies": ["kytos/of_core"], "license": "", "tags": [], diff --git a/setup.py b/setup.py index fba5c37..2424722 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,6 @@ NAPP_NAME = 'flow_stats' NAPP_USERNAME = 'amlight' -NAPP_VERSION = '2022.1.0' # Kytos var folder VAR_PATH = BASE_ENV / 'var' / 'lib' / 'kytos' @@ -247,6 +246,13 @@ def symlink_if_different(path, target): path.symlink_to(target) +def read_version_from_json(): + """Read the NApp version from NApp kytos.json file.""" + file = Path('kytos.json') + metadata = json.loads(file.read_text(encoding="utf8")) + return metadata['version'] + + def read_requirements(path="requirements/run.txt"): """Read requirements file and return a list.""" with open(path, "r", encoding="utf8") as file: @@ -258,7 +264,7 @@ def read_requirements(path="requirements/run.txt"): setup(name=f'{NAPP_USERNAME}_{NAPP_NAME}', - version=NAPP_VERSION, + version=read_version_from_json(), description='Store flow information and show statistics about them.', url='http://github.com/kytos-ng/flow_stats', author='FIU/AmLight team', From b5a6607423c2315c69b7a8ddfb017616c17e69c0 Mon Sep 17 00:00:00 2001 From: Vinicius Arcanjo Date: Tue, 9 Aug 2022 10:14:36 -0300 Subject: [PATCH 3/4] Fixed import on setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 2424722..d5a03f6 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ Run "python3 setup.py --help-commands" to list all available commands and their descriptions. """ +import json import os import shutil import sys From ccae50d8bd20df6b50f67f8d013a493deba01cfa Mon Sep 17 00:00:00 2001 From: Vinicius Arcanjo Date: Tue, 9 Aug 2022 14:14:56 -0300 Subject: [PATCH 4/4] Added kytos.json on MANIFEST.in --- MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/MANIFEST.in b/MANIFEST.in index aab18d8..115cfa7 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ +include kytos.json include requirements/run.txt