Merge b0f0426 into 28579d0

requirements.in

@@ -0,0 +1,22 @@
+argcomplete
+boto3
+durationpy
+hjson
+jmespath
+kappa==0.6.0
+lambda-packages>=0.20.0
+pip>=9.0.1
+python-dateutil<2.7.0
+python-slugify
+PyYAML
+future
+# previous version don't work with urllib3 1.24
+requests>=2.20.0
+six
+toml
+tqdm
+troposphere
+Werkzeug
+wheel
+wsgi-request-logger
+pip-tools

requirements.sh

@@ -0,0 +1,7 @@
+#! /bin/bash
+
+set -e
+
+pip-compile -o test_requirements.txt requirements.in test_requirements.in
+cp test_requirements.txt requirements.txt
+pip-compile -o requirements.txt requirements.in

requirements.txt

@@ -1,22 +1,42 @@
-argcomplete>=1.9.3
-boto3>=1.4.7
-durationpy>=0.5
-future>=0.16.0
-futures>=3.2.0; python_version < '3'
-hjson>=3.0.1
-jmespath>=0.9.3
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file=requirements.txt requirements.in
+#
+argcomplete==1.11.1
+boto3==1.11.15
+botocore==1.14.15         # via boto3, s3transfer
+certifi==2019.11.28       # via requests
+cfn-flip==1.2.2           # via troposphere
+chardet==3.0.4            # via requests
+click==7.0                # via cfn-flip, kappa, pip-tools
+docutils==0.15.2          # via botocore
+durationpy==0.5
+future==0.18.2
+hjson==3.0.1
+idna==2.8                 # via requests
+importlib-metadata==1.5.0  # via argcomplete
+jmespath==0.9.4
 kappa==0.6.0
-lambda-packages>=0.20.0
-pip>=9.0.1
-python-dateutil>=2.6.1, <2.7.0
-python-slugify>=1.2.4
-PyYAML>=3.13
-# previous version don't work with urllib3 1.24
-requests>=2.20.0
-six>=1.11.0
-toml>=0.9.4
-tqdm>=4.19.1
-troposphere>=1.9.0
-Werkzeug>=0.14
-wheel>=0.30.0
-wsgi-request-logger>=0.4.6
+lambda-packages==0.20.0
+pip-tools==4.4.1
+placebo==0.9.0            # via kappa
+python-dateutil==2.6.1
+python-slugify==4.0.0
+pyyaml==5.3
+requests==2.22.0
+s3transfer==0.3.3         # via boto3
+six==1.14.0
+text-unidecode==1.3       # via python-slugify
+toml==0.10.0
+tqdm==4.42.1
+troposphere==2.5.3
+urllib3==1.25.8           # via botocore, requests
+werkzeug==1.0.0
+wheel==0.34.2
+wsgi-request-logger==0.4.6
+zipp==2.2.0               # via importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip

setup.py

@@ -7,7 +7,7 @@
 with open('README.md') as readme_file:
     long_description = readme_file.read()
 
-with open(os.path.join(os.path.dirname(__file__), 'requirements.txt')) as f:
+with open(os.path.join(os.path.dirname(__file__), 'requirements.in')) as f:
     if sys.version_info[0] == 2:
         required = f.read().splitlines()
     else:
@@ -20,7 +20,7 @@
             if 'futures' not in package:
                 required.append(package)
 
-with open(os.path.join(os.path.dirname(__file__), 'test_requirements.txt')) as f:
+with open(os.path.join(os.path.dirname(__file__), 'test_requirements.in')) as f:
     test_required = f.read().splitlines()
 
 setup(
@@ -49,13 +49,13 @@
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Framework :: Django',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
+        'Framework :: Django :: 3.0',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     ],

test_requirements.in

@@ -0,0 +1,9 @@
+coveralls
+Django
+flake8
+Flask
+mock
+nose
+nose-timer
+placebo
+

test_requirements.txt

@@ -1,10 +1,61 @@
-coveralls>=1.1
-Django>=1.10.5, <2.0; python_version < '3'
-Django>=2.0; python_version >= '3'
-flake8>=3.6.0
-Flask>=0.12
-mock>=2.0.0
-nose>=1.3.7
-nose-timer>=0.6.0
-placebo>=0.8.1
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --output-file=test_requirements.txt requirements.in test_requirements.in
+#
+argcomplete==1.11.1
+asgiref==3.2.3            # via django
+boto3==1.11.15
+botocore==1.14.15         # via boto3, s3transfer
+certifi==2019.11.28       # via requests
+cfn-flip==1.2.2           # via troposphere
+chardet==3.0.4            # via requests
+click==7.0                # via cfn-flip, flask, kappa, pip-tools
+coverage==5.0.3           # via coveralls
+coveralls==1.11.0
+django==3.0.3
+docopt==0.6.2             # via coveralls
+docutils==0.15.2          # via botocore
+durationpy==0.5
+entrypoints==0.3          # via flake8
+flake8==3.7.9
+flask==1.1.1
+future==0.18.2
+hjson==3.0.1
+idna==2.8                 # via requests
+importlib-metadata==1.5.0  # via argcomplete
+itsdangerous==1.1.0       # via flask
+jinja2==2.11.1            # via flask
+jmespath==0.9.4
+kappa==0.6.0
+lambda-packages==0.20.0
+markupsafe==1.1.1         # via jinja2
+mccabe==0.6.1             # via flake8
+mock==4.0.1
+nose-timer==0.7.5
+nose==1.3.7
+pip-tools==4.4.1
+placebo==0.9.0
+pycodestyle==2.5.0        # via flake8
+pyflakes==2.1.1           # via flake8
+python-dateutil==2.6.1
+python-slugify==4.0.0
+pytz==2019.3              # via django
+pyyaml==5.3
+requests==2.22.0
+s3transfer==0.3.3         # via boto3
+six==1.14.0
+sqlparse==0.3.0           # via django
+text-unidecode==1.3       # via python-slugify
+toml==0.10.0
+tqdm==4.42.1
+troposphere==2.5.3
+urllib3==1.25.8           # via botocore, requests
+werkzeug==1.0.0
+wheel==0.34.2
+wsgi-request-logger==0.4.6
+zipp==2.2.0               # via importlib-metadata
 
+# The following packages are considered to be unsafe in a requirements file:
+# pip