chore(dependencies): Update Poetry dependencies + provisioner revisio…

…n to `573c195`
ZachiNachshon · Sep 26, 2023 · f092d89 · f092d89
1 parent 2a30664
commit f092d89
Show file tree

Hide file tree

Showing 10 changed files with 375 additions and 281 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,9 @@
 default: help
 PLUGINS=examples installers single_board
 
+POETRY_DEV=external/shell_scripts_lib/python/poetry_dev.sh
+POETRY_PIP_RELEASER=external/shell_scripts_lib/python/poetry_pip_releaser.sh
+
 # Generate SSH key for GitHub action:
 #  1. On local machine: ssh-keygen -t ed25519 -C "GitHub Actions"
 #  2. Add the public key as a deploy key to the repository you want to access:
@@ -100,6 +103,14 @@ clear-virtual-env-all: ## Clear all Poetry virtual environments
 		cd provisioner_$${plugin}_plugin; make clear-virtual-env; cd ..; \
 	done
 
+.PHONY: pDev
+pDev: ## Interact with ./external/.../poetry_dev.sh            (Usage: make pDev 'fmt --check-only')
+	@${POETRY_DEV} $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: pReleaser
+pReleaser: ## Interact with ./external/.../poetry_pip_releaser.sh   (Usage: make pReleaser 'install --build-type sdist --multi-project')
+	@${POETRY_PIP_RELEASER} $(filter-out $@,$(MAKECMDGOALS))
+
 # .PHONY: diagrams
 # diagrams: ## Format Python code using Black style (https://black.readthedocs.io)
 # 	@${POETRY_WRAPPER_DEV} run diagrams ${PROJECT_LOCATION}/rpi/os/diagrams/install_diag.py

diff --git a/provisioner_examples_plugin/Makefile b/provisioner_examples_plugin/Makefile
@@ -62,6 +62,14 @@ clear-virtual-env: ## Clear Poetry virtual environments
 	@rm -rf .venv
 	@echo Cleared.
 
+.PHONY: pDev
+pDev: ## Interact with ../external/.../poetry_dev.sh            (Usage: make pDev 'fmt --check-only')
+	@${POETRY_DEV} $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: pReleaser
+pReleaser: ## Interact with ../external/.../poetry_pip_releaser.sh   (Usage: make pReleaser 'install --build-type sdist --multi-project')
+	@${POETRY_PIP_RELEASER} $(filter-out $@,$(MAKECMDGOALS))
+
 .PHONY: help
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
diff --git a/provisioner_examples_plugin/poetry.lock b/provisioner_examples_plugin/poetry.lock
diff --git a/provisioner_examples_plugin/pyproject.toml b/provisioner_examples_plugin/pyproject.toml
@@ -67,8 +67,14 @@ python-libnmap = "^0.7.3"
 PyYAML = "^6.0"
 inquirer = "^2.10.0"
 python-hosts = "^1.0.3"
-python_core_lib = { git = "[email protected]:ZachiNachshon/provisioner.git", branch = "master", rev = "b42c27c", subdirectory = "python_core_lib" }
-provisioner_features_lib = { git = "[email protected]:ZachiNachshon/provisioner.git", branch = "master", rev = "b42c27c", subdirectory = "provisioner_features_lib" }
+# When using the dev-dependencies, the provisioner will be installed from the local folder
+# Those two lines should be commented out when running "poetry install" from within the plugins folder
+# To perform a clean build:
+#  - Remove poetry.lock file
+#  - Remove the .venv folder
+#  - Run "make deps" from within the plugins folder
+python_core_lib = { git = "[email protected]:ZachiNachshon/provisioner.git", branch = "master", rev = "573c195", subdirectory = "python_core_lib" }
+provisioner_features_lib = { git = "[email protected]:ZachiNachshon/provisioner.git", branch = "master", rev = "573c195", subdirectory = "provisioner_features_lib" }
 
 [tool.poetry.dev-dependencies]
 black = "^22.8.0"
@@ -79,7 +85,9 @@ diagrams = "^0.22.0"
 ruff = "^0.0.265"
 
 # For debugging purposes when running "poetry run provisioner" from within the plugins folder
-provisioner = { path = "../../provisioner/provisioner", develop = true }
+# Make sure to comment out the provisioner line under [tool.poetry.scripts]
+# When building for prodoction, remember to comment out this line
+# provisioner = { path = "../../provisioner/provisioner", develop = true }
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

diff --git a/provisioner_installers_plugin/Makefile b/provisioner_installers_plugin/Makefile
@@ -52,6 +52,14 @@ clear-virtual-env: ## Clear Poetry virtual environments
 	@rm -rf .venv
 	@echo Cleared.
 
+.PHONY: pDev
+pDev: ## Interact with ../external/.../poetry_dev.sh            (Usage: make pDev 'fmt --check-only')
+	@${POETRY_DEV} $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: pReleaser
+pReleaser: ## Interact with ../external/.../poetry_pip_releaser.sh   (Usage: make pReleaser 'install --build-type sdist --multi-project')
+	@${POETRY_PIP_RELEASER} $(filter-out $@,$(MAKECMDGOALS))
+
 .PHONY: help
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
diff --git a/provisioner_installers_plugin/poetry.lock b/provisioner_installers_plugin/poetry.lock
diff --git a/provisioner_installers_plugin/pyproject.toml b/provisioner_installers_plugin/pyproject.toml
@@ -64,8 +64,14 @@ python-libnmap = "^0.7.3"
 PyYAML = "^6.0"
 inquirer = "^2.10.0"
 python-hosts = "^1.0.3"
-python_core_lib = { git = "[email protected]:ZachiNachshon/provisioner.git", branch = "master", rev = "b42c27c", subdirectory = "python_core_lib" }
-provisioner_features_lib = { git = "[email protected]:ZachiNachshon/provisioner.git", branch = "master", rev = "b42c27c", subdirectory = "provisioner_features_lib" }
+# When using the dev-dependencies, the provisioner will be installed from the local folder
+# Those two lines should be commented out when running "poetry install" from within the plugins folder
+# To perform a clean build:
+#  - Remove poetry.lock file
+#  - Remove the .venv folder
+#  - Run "make deps" from within the plugins folder
+python_core_lib = { git = "[email protected]:ZachiNachshon/provisioner.git", branch = "master", rev = "573c195", subdirectory = "python_core_lib" }
+provisioner_features_lib = { git = "[email protected]:ZachiNachshon/provisioner.git", branch = "master", rev = "573c195", subdirectory = "provisioner_features_lib" }
 
 [tool.poetry.dev-dependencies]
 black = "^22.8.0"
@@ -76,7 +82,9 @@ diagrams = "^0.22.0"
 ruff = "^0.0.265"
 
 # For debugging purposes when running "poetry run provisioner" from within the plugins folder
-provisioner = { path = "../../provisioner/provisioner", develop = true }
+# Make sure to comment out the provisioner line under [tool.poetry.scripts]
+# When building for prodoction, remember to comment out this line
+# provisioner = { path = "../../provisioner/provisioner", develop = true }
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

diff --git a/provisioner_single_board_plugin/Makefile b/provisioner_single_board_plugin/Makefile
@@ -52,6 +52,14 @@ clear-virtual-env: ## Clear Poetry virtual environments
 	@rm -rf .venv
 	@echo Cleared.
 
+.PHONY: pDev
+pDev: ## Interact with ../external/.../poetry_dev.sh            (Usage: make pDev 'fmt --check-only')
+	@${POETRY_DEV} $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: pReleaser
+pReleaser: ## Interact with ../external/.../poetry_pip_releaser.sh   (Usage: make pReleaser 'install --build-type sdist --multi-project')
+	@${POETRY_PIP_RELEASER} $(filter-out $@,$(MAKECMDGOALS))
+
 .PHONY: help
 help:
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'