Skip to content

Commit

Permalink
Merge pull request #22 from kytos-ng/release/2022.2.0
Browse files Browse the repository at this point in the history
[Release] Bumped 2022.2.0
  • Loading branch information
viniarck authored Aug 10, 2022
2 parents 9fe84bd + 3d5eec5 commit 7efe5e0
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ Fixed
Security
========

[2022.2.0] - 2022-08-08
***********************

General Information
===================
- Increased unit test coverage to at least 85%

[2022.1.0] - 2022-02-08
***********************

Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
include kytos.json
include requirements/run.txt
11 changes: 11 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ After picking a color for each switch, installs high
priority flows in each switch, that send to the controller
packets with a neighbors' color.

Installing
==========

To install this NApp, make sure to have the same venv activated as you have ``kytos`` installed on:

.. code:: shell
$ git clone https://github.com/kytos-ng/coloring.git
$ cd coloring
$ python3 setup.py develop
Requirements
============

Expand Down
2 changes: 1 addition & 1 deletion kytos.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"username": "amlight",
"name": "coloring",
"description": "NApp to color a network topology",
"version": "2022.1.0",
"version": "2022.2.0",
"napp_dependencies": ["amlight/flow_stats", "kytos/flow_manager"],
"license": "",
"tags": [],
Expand Down
11 changes: 9 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,7 +24,6 @@

NAPP_NAME = 'coloring'
NAPP_USERNAME = 'amlight'
NAPP_VERSION = '2022.1.0'

# Kytos var folder
VAR_PATH = BASE_ENV / 'var' / 'lib' / 'kytos'
Expand Down Expand Up @@ -237,6 +237,13 @@ def _create_file_symlinks():
symlink_if_different(src, dst)


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:
Expand All @@ -261,7 +268,7 @@ def symlink_if_different(path, target):


setup(name=f'{NAPP_USERNAME}_{NAPP_NAME}',
version=NAPP_VERSION,
version=read_version_from_json(),
description='Amlight Coloring NApps',
url='http://github.com/kytos-ng/coloring',
author='Amlight Team',
Expand Down

0 comments on commit 7efe5e0

Please sign in to comment.