From 4d3cb417ebbd5700ec4d4d1871bb3c5b46193ac3 Mon Sep 17 00:00:00 2001
From: Lyz <lyz@riseup.net>
Date: Fri, 15 Oct 2021 10:57:52 +0200
Subject: [PATCH] ci: improve management of dependencies

---
 .cruft.json                 |  2 +-
 .github/workflows/build.yml |  1 +
 Makefile                    | 12 +++++++++---
 docs/requirements.in        |  2 +-
 requirements-dev.in         |  4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.cruft.json b/.cruft.json
index 041d56d..ddcfd3e 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "git@github.com:lyz-code/cookiecutter-python-project.git",
-  "commit": "f38de85495097610a17385287260e26668d159cc",
+  "commit": "f2d6860498002278bdb94df7b16b0b6758219111",
   "context": {
     "cookiecutter": {
       "project_name": "Autoimport",
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 95a57da..12fa47d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,6 +45,7 @@ jobs:
           python-version: 3.7
       - name: Install dependencies
         run: >-
+          pip install -r requirements.txt
           pip install -r ./docs/requirements.txt
           pip install -e .
       - name: Build the Documentation
diff --git a/Makefile b/Makefile
index 8c8fe7e..ec504c6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@ black = black --exclude assets --target-version py37 src docs/examples tests set
 
 .PHONY: install
 install:
-	python -m pip install -U setuptools pip
-	pip install -r requirements-dev.txt
+	python -m pip install -U setuptools pip pip-tools
+	python -m piptools sync requirements.txt requirements-dev.txt docs/requirements.txt
 	pip install -e .
 	pre-commit install
 
@@ -15,6 +15,9 @@ update:
 	@echo "- Updating dependencies -"
 	@echo "-------------------------"
 
+  # Sync your virtualenv with the expected state
+	python -m piptools sync requirements.txt requirements-dev.txt docs/requirements.txt
+
 	pip install -U pip
 
 	rm requirements.txt
@@ -29,7 +32,10 @@ update:
 	touch requirements-dev.txt
 	pip-compile -Ur --allow-unsafe requirements-dev.in --output-file requirements-dev.txt
 
-	pip install -r requirements-dev.txt
+  # Sync your virtualenv with the new state
+	python -m piptools sync requirements.txt requirements-dev.txt docs/requirements.txt
+
+  pip install -e .
 
 	@echo ""
 
diff --git a/docs/requirements.in b/docs/requirements.in
index b7564f1..57b8272 100644
--- a/docs/requirements.in
+++ b/docs/requirements.in
@@ -1,4 +1,4 @@
--r requirements.txt
+-c requirements.txt
 
 mkdocs
 mkdocs-git-revision-date-localized-plugin
diff --git a/requirements-dev.in b/requirements-dev.in
index e05f9cd..1996ba8 100644
--- a/requirements-dev.in
+++ b/requirements-dev.in
@@ -1,5 +1,5 @@
--r requirements.txt
--r docs/requirements.in
+-c requirements.txt
+-c docs/requirements.in
 
 # Testing
 pytest