From: Martin Skorupski <martin.skorupski@highstreet-technologies.com>
Date: Sun, 9 Mar 2025 13:14:43 +0000 (+0100)
Subject: Generate GeoJSON for topology
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=779cddfc31097b0bf0476bfe8705a59460cc1230;p=oam.git

Generate GeoJSON for topology

- minor preparation

IssueID: OAM-444
Change-Id: I34624d545b407973d2fbf5982968d5610f906df6
Signed-off-by: Martin Skorupski <martin.skorupski@highstreet-technologies.com>
---

diff --git a/code/network-generator/MANIFEST.in b/code/network-generator/MANIFEST.in
index 2a78d95..1880fbb 100644
--- a/code/network-generator/MANIFEST.in
+++ b/code/network-generator/MANIFEST.in
@@ -1,4 +1,4 @@
-# Copyright 2023 highstreet technologies GmbH
+# Copyright 2025 highstreet technologies USA Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/code/network-generator/Makefile b/code/network-generator/Makefile
index c91c3ee..8a1dbf7 100644
--- a/code/network-generator/Makefile
+++ b/code/network-generator/Makefile
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright 2024 highstreet technologies 
+# Copyright 2025 highstreet technologies USA Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 .ONESHELL:
 ENV_PREFIX=$(shell python -c "if __import__('pathlib').Path('.oam/bin/pip').exists(): print('.oam/bin/')")
 USING_POETRY=$(shell grep "tool.poetry" pyproject.toml && echo "yes")
+LINE_LENGTH=120
 
 .PHONY: help
 help:             ## Show the help.
@@ -43,15 +44,15 @@ install:          ## Install the project in dev mode.
 .PHONY: format
 format:           ## Format code using black & isort.
 	$(ENV_PREFIX)isort network_generation/
-	$(ENV_PREFIX)black -l 79 network_generation/
-	$(ENV_PREFIX)black -l 79 tests/
+	$(ENV_PREFIX)black -l $(LINE_LENGTH) network_generation/
+	$(ENV_PREFIX)black -l $(LINE_LENGTH) tests/
 
 .PHONY: lint
 lint:             ## Run pep8, black, mypy linters.
-	$(ENV_PREFIX)flake8 network_generation/
-	$(ENV_PREFIX)flake8 tests/
-	$(ENV_PREFIX)black -l 79 --check network_generation/
-	$(ENV_PREFIX)black -l 79 --check tests/
+	$(ENV_PREFIX)flake8 --max-line-length=$(LINE_LENGTH) network_generation/
+	$(ENV_PREFIX)flake8 --max-line-length=$(LINE_LENGTH) tests/
+	$(ENV_PREFIX)black -l $(LINE_LENGTH) --check network_generation/
+	$(ENV_PREFIX)black -l $(LINE_LENGTH) --check tests/
 	$(ENV_PREFIX)mypy --ignore-missing-imports --disallow-untyped-defs --check-untyped-def network_generation/
 
 .PHONY: test
diff --git a/code/network-generator/requirements-test.txt b/code/network-generator/requirements-test.txt
index 7aca30f..cccd44c 100644
--- a/code/network-generator/requirements-test.txt
+++ b/code/network-generator/requirements-test.txt
@@ -1,4 +1,4 @@
-# Copyright 2023 highstreet technologies GmbH
+# Copyright 2025 highstreet technologies USA Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/code/network-generator/requirements.txt b/code/network-generator/requirements.txt
index d34d9cc..6f9161a 100644
--- a/code/network-generator/requirements.txt
+++ b/code/network-generator/requirements.txt
@@ -1,4 +1,4 @@
-# Copyright 2023 highstreet technologies GmbH
+# Copyright 2025 highstreet technologies USA Corp.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.