From ee3f43985eac472b506ba3d5f91a7a1cab8ab57c Mon Sep 17 00:00:00 2001
From: nicolargo <nicolas@nicolargo.com>
Date: Sat, 20 Aug 2022 09:00:19 +0200
Subject: Update docs and Makefile

---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1000af7e..d499c491 100644
--- a/Makefile
+++ b/Makefile
@@ -14,35 +14,35 @@ install: ## Open a Web Browser to the installation procedure
 venv-python: ## Install Python 3 venv
 	virtualenv -p /usr/bin/python3 venv
 
-venv-dev: ## Install Python 3 dev dependencies
+venv-dev: venv-python ## Install Python 3 dev dependencies
 	./venv/bin/pip install -r dev-requirements.txt
 	./venv/bin/pip install -r doc-requirements.txt
 
-venv-dev-upgrade: ## Upgrade Python 3 dev dependencies
+venv-dev-upgrade: venv-dev ## Upgrade Python 3 dev dependencies
 	./venv/bin/pip install --upgrade pip
 	./venv/bin/pip install --upgrade -r dev-requirements.txt
 	./venv/bin/pip install --upgrade -r doc-requirements.txt
 
-venv: ## Install Python 3 run-time dependencies
+venv: venv-python ## Install Python 3 run-time dependencies
 	./venv/bin/pip install -r requirements.txt
 	./venv/bin/pip install -r optional-requirements.txt
 
-venv-upgrade: ## Upgrade Python 3 run-time dependencies
+venv-upgrade: venv ## Upgrade Python 3 run-time dependencies
 	./venv/bin/pip install --upgrade -r dev-requirements.txt
 	./venv/bin/pip install --upgrade -r requirements.txt
 	./venv/bin/pip install --upgrade -r optional-requirements.txt
 
-test: venv ## Run unit tests
+test: venv-upgrade venv-dev-upgrade ## Run unit tests
 	./venv/bin/python ./unitest.py
 	./venv/bin/python ./unitest-restful.py
 	./venv/bin/python ./unitest-xmlrpc.py
 	./venv/bin/python -m black ./glances --check --exclude outputs/static
 	./venv/bin/pyright glances
 
-format: venv ## Format the code
+format: venv-dev-upgrade ## Format the code
 	./venv/bin/python -m black ./glances --exclude outputs/static
 
-docs: venv-dev ## Create the documentation
+docs: venv-dev-upgrade ## Create the documentation
 	./venv/bin/python -m glances -C ./conf/glances.conf --api-doc > ./docs/api.rst
 	cd docs && ./build.sh && cd ..
 
@@ -50,10 +50,10 @@ docs-server: docs ## Start a Web server to serve the documentation
 	(sleep 2 && sensible-browser "http://localhost:$(PORT)") &
 	cd docs/_build/html/ && ../../../venv/bin/python -m http.server $(PORT)
 
-webui: venv-dev ## Build the Web UI
+webui: venv-dev-upgrade ## Build the Web UI
 	cd glances/outputs/static/ && npm ci && npm run build
 
-webui-audit: venv-dev ## Audit the Web UI
+webui-audit: venv-dev-upgrade ## Audit the Web UI
 	cd glances/outputs/static/ && npm audit
 
 run: ## Start Glances in console mode (also called standalone)
@@ -98,10 +98,10 @@ release-note: ## Generate release note
 	@echo "\n"
 	git --no-pager shortlog -s -n $(LASTTAG)..HEAD
 
-flatpak: venv-dev ## Generate FlatPack JSON file
+flatpak: venv-dev-upgrade ## Generate FlatPack JSON file
 	git clone https://github.com/flatpak/flatpak-builder-tools.git
 	./venv/bin/python ./flatpak-builder-tools/pip/flatpak-pip-generator glances
-	mv python3-glances.json ../flathub/
 	rm -rf ./flatpak-builder-tools
+	@echo "Now follow: https://github.com/flathub/flathub/wiki/App-Submission"
 
 .PHONY: test docs docs-server venv
-- 
cgit v1.2.3