From 0a18f98dc2ce29e788a6ddf0f3081c7e0c090a23 Mon Sep 17 00:00:00 2001 From: Carl Vitzthum Date: Thu, 19 Jul 2018 13:06:58 -0400 Subject: [PATCH] Trying to strictly require things from dcicutils --- MANIFEST.in | 4 ++++ dcicutils/_version.py | 2 +- requirements.txt | 5 +++-- setup.py | 13 ++++++------- 4 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 000000000..ff32ad66e --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,4 @@ +include requirements.txt +include README.md +# "graft" includes all files recursively +graft dcicutils diff --git a/dcicutils/_version.py b/dcicutils/_version.py index 811eb0567..cbbde4f25 100644 --- a/dcicutils/_version.py +++ b/dcicutils/_version.py @@ -1,4 +1,4 @@ """Version information.""" # The following line *must* be the last in the module, exactly as formatted: -__version__ = "0.3.6" +__version__ = "0.03.6" diff --git a/requirements.txt b/requirements.txt index 1f95f573c..aacd08d33 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ +awscli==1.15.42 boto3==1.7.42 botocore==1.10.42 -elasticsearch>=5.3.0,<6.0.0 -aws_requests_auth +elasticsearch==5.5.2 +aws_requests_auth==0.4.1 diff --git a/setup.py b/setup.py index 2b9de9229..33bf1fbc8 100644 --- a/setup.py +++ b/setup.py @@ -5,16 +5,15 @@ here = os.path.abspath(os.path.dirname(__file__)) README = open(os.path.join(here, 'README.md')).read() -requires = [ - 'pytest-runner', - 'boto3==1.7.42', - 'botocore==1.10.42', - 'elasticsearch>=5.3.0,<6.0.0', - 'aws_requests_auth' -] + +# we want strict package requirements on install +with open('requirements.txt') as f: + requires = f.read().splitlines() +requires = [req.strip() for req in requires] tests_require = [ 'pytest', + 'pytest-runner', 'pytest-mock', 'pytest-cov', ]