Merge requirements3.txt with requirements.txt

.travis.yml

@@ -24,7 +24,6 @@ before_install:
 install:
   - "pip install demjson"
   - "pip install -r requirements.txt"
-  - "pip install -r requirements3.txt"
 
 env:
   - MAKE_TARGET=test.syntax SHARD=0 SHARDS=1

Makefile

@@ -28,7 +28,6 @@ upgrade: ## update the pip requirements files to use the latest releases satisfy
 	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
 	pip-compile --upgrade -o requirements.txt requirements/base.in
 	pip-compile --upgrade -o playbooks/roles/aws/templates/requirements.txt.j2 requirements/aws.in
-	pip-compile --upgrade -o requirements3.txt requirements/ses-limits.in
 	pip-compile --upgrade -o util/elasticsearch/requirements.txt requirements/elasticsearch.in
 	pip-compile --upgrade -o util/jenkins/update_celery_monitoring/requirements.txt requirements/celery.in
 	pip-compile --upgrade -o util/jenkins/check_celery_progress/requirements.txt requirements/celery_progress.in
@@ -40,7 +39,6 @@ upgrade: ## update the pip requirements files to use the latest releases satisfy
  	    requirements/pip-tools.txt \
 	    requirements.txt \
 	    playbooks/roles/aws/templates/requirements.txt.j2 \
-	    requirements3.txt \
 	    util/elasticsearch/requirements.txt \
 	    util/jenkins/update_celery_monitoring/requirements.txt \
 	    util/jenkins/check_celery_progress/requirements.txt \

requirements/base.in

@@ -7,7 +7,6 @@ boto3==1.7.14
 datadog==0.8.0
 docopt==0.6.2
 ecdsa==0.13.3
-futures ; python_version == "2.7"   # via s3transfer
 Jinja2==2.8
 mysqlclient==1.3.0                 # Needed for the mysql_db module
 networkx==1.11
@@ -18,4 +17,3 @@ pycrypto==2.6.1
 pymongo==3.9.0                      # Needed for the mongo_* modules (playbooks/library/mongo_*)
 PyYAML==3.12
 requests==2.20.0
-wsgiref==0.1.2 ; python_version == "2.7"

requirements3.txt

@@ -1,18 +1,3 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    make upgrade
-#
-awscli==1.15.19           # via -r requirements/ses-limits.in
-boto3==1.7.14             # via -r requirements/ses-limits.in
-botocore==1.10.19         # via awscli, boto3, s3transfer
-colorama==0.3.7           # via awscli
-docutils==0.16            # via awscli, botocore
-jmespath==0.9.5           # via boto3, botocore
-pyasn1==0.4.8             # via rsa
-python-dateutil==2.8.1    # via botocore
-pyyaml==3.12              # via awscli
-rsa==3.4.2                # via awscli
-s3transfer==0.1.13        # via awscli, boto3
-six==1.14.0               # via python-dateutil
+# File not removed in order to be backwards compatibility
+# Use requirements.txt instead
+-r requirements.txt