From 4dd5e7ef732288c1c168a5b09cf426f55a3e994a Mon Sep 17 00:00:00 2001 From: Martin Skorupski Date: Sat, 18 Nov 2023 18:00:50 +0100 Subject: [PATCH] Add cell-scale-factor to jsonschema - add jsonschema to runtime requirements Issue-ID: OAM-392 Change-Id: Id92524b14ed59667b6e277cc0bc70862df1aa730 Signed-off-by: Martin Skorupski --- code/network-generator/CONTRIBUTING.md | 8 +------- code/network-generator/Makefile | 4 ++-- code/network-generator/requirements.txt | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/code/network-generator/CONTRIBUTING.md b/code/network-generator/CONTRIBUTING.md index c062074..478386a 100644 --- a/code/network-generator/CONTRIBUTING.md +++ b/code/network-generator/CONTRIBUTING.md @@ -17,13 +17,7 @@ This instructions are for linux base systems. (Linux, MacOS, BSD, etc.) ## Prerequisites ``` -pip install isort -pip install black -pip install mypy -pip install flake8 -pip install pytest -pip install coverage -pip install pytest-cov +sudo apt install python3.10-venv ``` ## Setting up your own virtual environment diff --git a/code/network-generator/Makefile b/code/network-generator/Makefile index 78ac7ca..ab2b357 100644 --- a/code/network-generator/Makefile +++ b/code/network-generator/Makefile @@ -1,5 +1,5 @@ .ONESHELL: -ENV_PREFIX=$(shell python3 -c "if __import__('pathlib').Path('.venv/bin/pip').exists(): print('.venv/bin/')") +ENV_PREFIX=$(shell python -c "if __import__('pathlib').Path('.venv/bin/pip').exists(): print('.venv/bin/')") USING_POETRY=$(shell grep "tool.poetry" pyproject.toml && echo "yes") .PHONY: help @@ -25,7 +25,7 @@ install: ## Install the project in dev mode. $(ENV_PREFIX)pip install -e .[test] .PHONY: format -format: ## Format code using black & isort. +format: ## Format code using black & isort. $(ENV_PREFIX)isort network_generation/ $(ENV_PREFIX)black -l 79 network_generation/ $(ENV_PREFIX)black -l 79 tests/ diff --git a/code/network-generator/requirements.txt b/code/network-generator/requirements.txt index de6de74..4957d9d 100644 --- a/code/network-generator/requirements.txt +++ b/code/network-generator/requirements.txt @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -# none at this point in time \ No newline at end of file +jsonschema -- 2.16.6