Use new utils python freeze script in Makefile for freeze-requirement…

…s target
Crown-Commercial-Service · Nov 19, 2018 · 5823c38 · 5823c38
1 parent b7b52f7
commit 5823c38
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -32,15 +32,8 @@ requirements-dev: virtualenv requirements-dev.txt
 	${VIRTUALENV_ROOT}/bin/pip install -r requirements-dev.txt
 
 .PHONY: freeze-requirements
-freeze-requirements:
-	rm -rf venv-freeze
-	python3 -m venv venv-freeze
-	$$(pwd)/venv-freeze/bin/pip install -r requirements-app.txt
-	echo '# This file is autogenerated. Do not edit it manually.' > requirements.txt
-	cat requirements-app.txt >> requirements.txt
-	echo '' >> requirements.txt
-	$$(pwd)/venv-freeze/bin/pip freeze -r requirements-app.txt | sed -n '/The following requirements were added by pip freeze/,$$p' >> requirements.txt
-	rm -rf venv-freeze
+freeze-requirements: virtualenv requirements-dev requirements-app.txt
+	${VIRTUALENV_ROOT}/bin/python -m dmutils.repoutils.freeze_requirements requirements-app.txt
 
 .PHONY: yarn-install
 yarn-install:

diff --git a/requirements-app.txt b/requirements-app.txt
@@ -8,5 +8,5 @@ itsdangerous==0.24
 lxml==3.8.0
 
 git+https://github.com/alphagov/digitalmarketplace-content-loader.git@5.0.0#egg=digitalmarketplace-content-loader==5.0.0
-git+https://github.com/alphagov/digitalmarketplace-utils.git@45.0.0#egg=digitalmarketplace-utils==45.0.0
+git+https://github.com/alphagov/digitalmarketplace-utils.git@45.0.2#egg=digitalmarketplace-utils==45.0.2
 git+https://github.com/alphagov/digitalmarketplace-apiclient.git@19.7.0#egg=digitalmarketplace-apiclient==19.7.0
diff --git a/requirements.txt b/requirements.txt
@@ -9,7 +9,7 @@ itsdangerous==0.24
 lxml==3.8.0
 
 git+https://github.com/alphagov/digitalmarketplace-content-loader.git@5.0.0#egg=digitalmarketplace-content-loader==5.0.0
-git+https://github.com/alphagov/digitalmarketplace-utils.git@45.0.0#egg=digitalmarketplace-utils==45.0.0
+git+https://github.com/alphagov/digitalmarketplace-utils.git@45.0.2#egg=digitalmarketplace-utils==45.0.2
 git+https://github.com/alphagov/digitalmarketplace-apiclient.git@19.7.0#egg=digitalmarketplace-apiclient==19.7.0
 
 ## The following requirements were added by pip freeze: