From ac660614ba8a9f6ae158df4339167f9caef3a42a Mon Sep 17 00:00:00 2001 From: Eric Mill Date: Sun, 1 Apr 2018 14:10:19 -0400 Subject: [PATCH] Continue separating out requirements by purpose. --- lambda/requirements-lambda.txt | 6 ++++++ requirements-dev.txt | 5 +++++ requirements-gatherers.txt | 3 +++ requirements-scanners.txt | 6 +----- requirements.txt | 38 ++++++++-------------------------- 5 files changed, 24 insertions(+), 34 deletions(-) create mode 100644 lambda/requirements-lambda.txt create mode 100644 requirements-dev.txt create mode 100644 requirements-gatherers.txt diff --git a/lambda/requirements-lambda.txt b/lambda/requirements-lambda.txt new file mode 100644 index 00000000..18061732 --- /dev/null +++ b/lambda/requirements-lambda.txt @@ -0,0 +1,6 @@ +# These are the only dependencies which must get packaged +# into every (Python-based) Lambda container build. + +strict-rfc3339 +publicsuffix + diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 00000000..0963f1f4 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,5 @@ +# These requirements are useful or needed when developing +# domain-scan itself. + +ipython +pytest diff --git a/requirements-gatherers.txt b/requirements-gatherers.txt new file mode 100644 index 00000000..e374b3c1 --- /dev/null +++ b/requirements-gatherers.txt @@ -0,0 +1,3 @@ +# censys +google-cloud-bigquery +google-auth-oauthlib diff --git a/requirements-scanners.txt b/requirements-scanners.txt index 4bc97f8f..d519ecac 100644 --- a/requirements-scanners.txt +++ b/requirements-scanners.txt @@ -1,8 +1,3 @@ -############ -# Scanners -############ - -cryptography # a11y pyyaml @@ -16,3 +11,4 @@ git+https://github.com/dhs-ncats/trustymail.git#egg=trustymail # sslyze sslyze>=1.3.4,<1.4.0 +cryptography diff --git a/requirements.txt b/requirements.txt index 702cc7c4..f462502f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,33 +1,13 @@ -########################## -# Common (Local + Lambda) -########################## -# -# These are the only dependencies which must get packaged -# into every (Python-based) Lambda container build. - -strict-rfc3339 -publicsuffix +######## +# NOTE: Any requirements which are needed for Python-based Lambda function +# packaging should also be listed in lambda/requirements-lambda.txt. +# Those are in the bottom section below. -################# -# Common (Local) -################# - +# Used by parts of domain-scan, but not used inside of Lambda function +# invocation. boto3 -ipython - - -############ -# Gatherers -############ -# censys -google-cloud-bigquery -google-auth-oauthlib - - -############ -# Tests -############ - -pytest +# Used in Lanbda functions. Also copied to lambda/requirements-lambda.txt. +strict-rfc3339 +publicsuffix