From 3e5cbb40ceae72f6fe6697c8cefe0ac16a2db599 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Thu, 29 Mar 2018 09:10:41 -0700 Subject: [PATCH] Updating requirements --- Makefile | 19 ++++++++++++++++++- requirements-tests.in | 2 +- requirements-tests.txt | 4 ++-- requirements.txt | 4 ++-- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index bcd6e7e1..d3d3ecc2 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NPM_ROOT = ./node_modules STATIC_DIR = src/lemur/static/app - +SHELL=/bin/bash USER := $(shell whoami) develop: update-submodules setup-git @@ -104,4 +104,21 @@ coverage: develop publish: python setup.py sdist bdist_wheel upload +up-reqs: +ifndef VIRTUAL_ENV + $(error Please activate virtualenv first) +endif + @echo "--> Updating Python requirements" + pip install --upgrade pip-tools + pip-compile --output-file requirements-docs.txt requirements-docs.in -U + pip-compile --output-file requirements-dev.txt requirements-dev.in -U + pip-compile --output-file requirements-tests.txt requirements-tests.in -U + pip-compile --output-file requirements.txt requirements.in -U + @echo "--> Done updating Python requirements" + @echo "--> Installing new dependencies" + pip install -e . + @echo "--> Done installing new dependencies" + @echo "" + + .PHONY: develop dev-postgres dev-docs setup-git build clean update-submodules test testloop test-cli test-js test-python lint lint-python lint-js coverage publish release diff --git a/requirements-tests.in b/requirements-tests.in index 71d00c31..44a5c59f 100644 --- a/requirements-tests.in +++ b/requirements-tests.in @@ -2,7 +2,7 @@ coverage factory-boy Faker freezegun -moto>1,<2 +moto nose pyflakes pytest diff --git a/requirements-tests.txt b/requirements-tests.txt index 9f69d143..a3ca0578 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -7,9 +7,9 @@ asn1crypto==0.24.0 # via cryptography attrs==17.4.0 # via pytest aws-xray-sdk==0.95 # via moto -boto3==1.6.18 # via moto +boto3==1.6.19 # via moto boto==2.48.0 # via moto -botocore==1.9.18 # via boto3, moto, s3transfer +botocore==1.9.19 # via boto3, moto, s3transfer certifi==2018.1.18 # via requests cffi==1.11.5 # via cryptography chardet==3.0.4 # via requests diff --git a/requirements.txt b/requirements.txt index 473853de..129972ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,8 +12,8 @@ arrow==0.12.1 asn1crypto==0.24.0 # via cryptography bcrypt==3.1.4 # via flask-bcrypt, paramiko blinker==1.4 # via flask-mail, flask-principal, raven -boto3==1.6.18 -botocore==1.9.18 # via boto3, s3transfer +boto3==1.6.19 +botocore==1.9.19 # via boto3, s3transfer cffi==1.11.5 # via bcrypt, cryptography, pynacl click==6.7 # via flask cryptography==2.2.2