From 93cad33e56c5b2ac40790bcb0f539e8ea34b90d3 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Mon, 7 Mar 2022 13:06:59 -0800
Subject: [PATCH] github/workflows: update dependencies and enable
 python-is-python3

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 .github/workflows/main.yml | 16 +++++++++-------
 Makefile                   |  4 ++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d9ed7759..cf5ec83b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -43,18 +43,21 @@ jobs:
               gettext \
               flake8 \
               pylint \
+              python-is-python3 \
               python-pytest \
               python3-pytest \
               python3-pytest-flake8
-
           # Runtime dependencies (required)
           sudo apt-get install \
+              python3-qtpy \
               python3-pyqt5
-
           # Runtime dependencies (optional)
           sudo apt-get install \
-              python3-qtpy \
               python3-send2trash
+          # Development environment
+          make requirements-dev
+          # These requirements are already satisfied by python3-send2trash.
+          # make requirements-optional
 
       - name: Build Translations
         run: make i18n
@@ -97,11 +100,10 @@ jobs:
 
       - name: Install Dependencies
         run: |
-          pip install -r requirements/requirements.txt
-          pip install -r requirements/requirements-optional.txt
-          pip install -r requirements/requirements-maint.txt
-          pip install -r requirements/requirements-dev.txt
           pip install PyQt5
+          pip install qtpy
+          pip install --requirement requirements/requirements-dev.txt
+          pip install --requirement requirements/requirements-maint.txt
 
       # Based on: contrib/win32/run-pynsist.sh
       - name: Build Installer
diff --git a/Makefile b/Makefile
index 02bf920a..cd5380c5 100644
--- a/Makefile
+++ b/Makefile
@@ -297,6 +297,10 @@ format::
 requirements-dev::
 	$(PIP) install --requirement requirements/requirements-dev.txt
 
+.PHONY: requirements-optional
+requirements-optional::
+	$(PIP) install --requirement requirements/requirements-optional.txt
+
 .PHONY: tox
 tox::
 	$(TOX) $(TOX_FLAGS) $(flags)
-- 
2.11.4.GIT