From 8b1e4afd3b346070911c624c6fb1b839077196f0 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 8 Jan 2021 16:40:51 +0000 Subject: [PATCH] Install pip tools as part of freeze-requirements Makes the command faster and more self contained. --- Makefile | 3 ++- requirements_for_test.in | 1 - requirements_for_test.txt | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8aee851af..fdc65cb57 100644 --- a/Makefile +++ b/Makefile @@ -75,7 +75,8 @@ fix-imports: isort -rc ./app ./tests .PHONY: freeze-requirements -freeze-requirements: requirements-for-test requirements.in requirements_for_test.in +freeze-requirements: ## create static requirements.txt + ${VIRTUALENV_ROOT}/bin/pip install pip-tools ${VIRTUALENV_ROOT}/bin/pip-compile requirements.in ${VIRTUALENV_ROOT}/bin/pip-compile requirements_for_test.in diff --git a/requirements_for_test.in b/requirements_for_test.in index afa944e1c..bc6a0b2b9 100644 --- a/requirements_for_test.in +++ b/requirements_for_test.in @@ -1,5 +1,4 @@ -r requirements.txt -pip-tools==5.4.0 isort==4.3.21 pytest==5.3.2 pytest-env==0.6.2 diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 409161489..2e9a71209 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -17,7 +17,7 @@ botocore==1.19.51 # via -r requirements.txt, awscli, boto3, s3transfer cachetools==4.2.0 # via -r requirements.txt, notifications-utils certifi==2020.12.5 # via -r requirements.txt, requests chardet==4.0.0 # via -r requirements.txt, requests -click==7.1.2 # via -r requirements.txt, flask, pip-tools +click==7.1.2 # via -r requirements.txt, flask colorama==0.4.3 # via -r requirements.txt, awscli dnspython==1.16.0 # via -r requirements.txt, eventlet docopt==0.6.2 # via -r requirements.txt, notifications-python-client @@ -63,7 +63,6 @@ openpyxl==3.0.5 # via -r requirements.txt, pyexcel-xlsx orderedset==2.0.3 # via -r requirements.txt, notifications-utils packaging==20.8 # via -r requirements.txt, bleach, pytest phonenumbers==8.12.15 # via -r requirements.txt, notifications-utils -pip-tools==5.4.0 # via -r requirements_for_test.in pluggy==0.13.1 # via pytest prometheus-client==0.9.0 # via -r requirements.txt, gds-metrics py==1.10.0 # via pytest, pytest-forked @@ -94,7 +93,7 @@ requests==2.25.1 # via -r requirements.txt, awscli-cwlogs, govuk-bank-h rsa==4.5 # via -r requirements.txt, awscli s3transfer==0.3.3 # via -r requirements.txt, awscli, boto3 shapely==1.7.1 # via -r requirements.txt -six==1.15.0 # via -r requirements.txt, awscli-cwlogs, bleach, eventlet, flake8-print, freezegun, govuk-bank-holidays, pip-tools, pytest-xdist, python-dateutil, requests-mock +six==1.15.0 # via -r requirements.txt, awscli-cwlogs, bleach, eventlet, flake8-print, freezegun, govuk-bank-holidays, pytest-xdist, python-dateutil, requests-mock smartypants==2.0.1 # via -r requirements.txt, notifications-utils soupsieve==2.1 # via beautifulsoup4 statsd==3.3.0 # via -r requirements.txt, notifications-utils @@ -110,5 +109,4 @@ xlwt==1.3.0 # via -r requirements.txt, pyexcel-xls zipp==3.4.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -# pip # setuptools