Merge pull request #1219 from castrapel/forcible_remove_python-ldap

reqs update

Makefile

@@ -109,12 +109,15 @@ ifndef VIRTUAL_ENV
     $(error Please activate virtualenv first)
 endif
 	@echo "--> Updating Python requirements"
+	pip install --upgrade pip
 	pip install --upgrade pip-tools
 	pip-compile --output-file requirements-docs.txt requirements-docs.in -U --no-index
 	pip-compile --output-file requirements-dev.txt requirements-dev.in -U --no-index
 	pip-compile --output-file requirements-tests.txt requirements-tests.in -U --no-index
 	pip-compile --output-file requirements.txt requirements.in -U --no-index
 	@echo "--> Done updating Python requirements"
+	@echo "--> Removing python-ldap from requirements-docs.txt"
+	grep -v "python-ldap" requirements-docs.txt > tempreqs && mv tempreqs requirements-docs.txt
 	@echo "--> Installing new dependencies"
 	pip install -e .
 	@echo "--> Done installing new dependencies"

requirements-dev.in

@@ -1,3 +1,5 @@
+# Run `make up-reqs` to update pinned dependencies in requirement text files
+
 flake8>=3.2,<4.0
 pre-commit
 invoke

requirements-dev.txt

@@ -6,11 +6,11 @@
 #
 aspy.yaml==1.1.0          # via pre-commit
 cached-property==1.4.2    # via pre-commit
-certifi==2018.1.18        # via requests
+certifi==2018.4.16        # via requests
 cfgv==1.0.0               # via pre-commit
 chardet==3.0.4            # via requests
 flake8==3.5.0
-identify==1.0.11          # via pre-commit
+identify==1.0.13          # via pre-commit
 idna==2.6                 # via requests
 invoke==0.22.1
 mccabe==0.6.1             # via flake8
@@ -23,7 +23,7 @@ pyyaml==3.12              # via aspy.yaml, pre-commit
 requests-toolbelt==0.8.0  # via twine
 requests==2.18.4          # via requests-toolbelt, twine
 six==1.11.0               # via cfgv, pre-commit
-tqdm==4.22.0              # via twine
+tqdm==4.23.0              # via twine
 twine==1.11.0
 urllib3==1.22             # via requests
 virtualenv==15.2.0        # via pre-commit

requirements-docs.in

@@ -1,3 +1,6 @@
+# Note: python-ldap from requirements breaks due to readthedocs.io not having the correct header files
+# The `make up-reqs` will update all requirement text files, and forcibly remove python-ldap
+# from requirements-docs.txt
 -r requirements.txt
 sphinx
 sphinxcontrib-httpdomain

requirements-docs.txt

@@ -14,8 +14,8 @@ asn1crypto==0.24.0
 babel==2.5.3              # via sphinx
 bcrypt==3.1.4
 blinker==1.4
-boto3==1.7.4
+boto3==1.7.6
-botocore==1.10.4
+botocore==1.10.6
 cffi==1.11.5
 click==6.7
 cryptography==2.2.2
@@ -37,7 +37,7 @@ inflection==0.3.1
 itsdangerous==0.24
 jinja2==2.10
 jmespath==0.9.3
-josepy==1.0.1
+josepy==1.1.0
 lockfile==0.12.2
 mako==1.0.7
 markupsafe==1.0
@@ -59,22 +59,21 @@ pynacl==1.2.1
 pyopenssl==17.2.0
 pyparsing==2.2.0          # via packaging
 pyrfc3339==1.0
-python-dateutil==2.6.1
+python-dateutil==2.7.2
 python-editor==1.0.3
-# python-ldap==3.0.0 can install due to readthedocs.io not having the correct header files
 pytz==2018.4
-raven[flask]==6.6.0
+raven[flask]==6.7.0
 requests[security]==2.11.1
 retrying==1.3.3
 s3transfer==0.1.13
 six==1.11.0
 snowballstemmer==1.2.1    # via sphinx
 sphinx-rtd-theme==0.3.0
-sphinx==1.7.2
+sphinx==1.7.3
 sphinxcontrib-httpdomain==1.6.1
 sphinxcontrib-websupport==1.0.1  # via sphinx
 sqlalchemy-utils==0.33.2
-sqlalchemy==1.2.6
+sqlalchemy==1.2.7
 tabulate==0.8.2
 werkzeug==0.14.1
 xmltodict==0.11.0

requirements-tests.in

@@ -1,3 +1,5 @@
+# Run `make up-reqs` to update pinned dependencies in requirement text files
+
 coverage
 factory-boy
 Faker

requirements-tests.txt

@@ -7,14 +7,14 @@
 asn1crypto==0.24.0        # via cryptography
 attrs==17.4.0             # via pytest
 aws-xray-sdk==0.95        # via moto
-boto3==1.7.4              # via moto
+boto3==1.7.6              # via moto
 boto==2.48.0              # via moto
-botocore==1.10.4          # via boto3, moto, s3transfer
+botocore==1.10.6          # via boto3, moto, s3transfer
-certifi==2018.1.18        # via requests
+certifi==2018.4.16        # via requests
 cffi==1.11.5              # via cryptography
 chardet==3.0.4            # via requests
 click==6.7                # via flask
-cookies==2.2.1            # via moto
+cookies==2.2.1            # via moto, responses
 coverage==4.5.1
 cryptography==2.2.2       # via moto
 docker-pycreds==0.2.2     # via docker
@@ -33,7 +33,7 @@ jsonpickle==0.9.6         # via aws-xray-sdk
 markupsafe==1.0           # via jinja2
 mock==2.0.0               # via moto
 more-itertools==4.1.0     # via pytest
-moto==1.3.1
+moto==1.3.3
 nose==1.3.7
 pbr==4.0.2                # via mock
 pluggy==0.6.0             # via pytest
@@ -48,9 +48,10 @@ python-dateutil==2.6.1    # via botocore, faker, freezegun, moto
 pytz==2018.4              # via moto
 pyyaml==3.12              # via pyaml
 requests-mock==1.4.0
-requests==2.18.4          # via aws-xray-sdk, docker, moto, requests-mock
+requests==2.18.4          # via aws-xray-sdk, docker, moto, requests-mock, responses
+responses==0.9.0          # via moto
 s3transfer==0.1.13        # via boto3
-six==1.11.0               # via cryptography, docker, docker-pycreds, faker, freezegun, mock, more-itertools, moto, pytest, python-dateutil, requests-mock, websocket-client
+six==1.11.0               # via cryptography, docker, docker-pycreds, faker, freezegun, mock, more-itertools, moto, pytest, python-dateutil, requests-mock, responses, websocket-client
 text-unidecode==1.2       # via faker
 urllib3==1.22             # via requests
 websocket-client==0.47.0  # via docker

requirements.in

@@ -1,3 +1,5 @@
+# Run `make up-reqs` to update pinned dependencies in requirement text files
+
 acme
 alembic-autogenerate-enums
 arrow

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.7.4
+boto3==1.7.6
-botocore==1.10.4          # via boto3, s3transfer
+botocore==1.10.6          # via boto3, s3transfer
 cffi==1.11.5              # via bcrypt, cryptography, pynacl
 click==6.7                # via flask
 cryptography==2.2.2
@@ -34,7 +34,7 @@ inflection==0.3.1
 itsdangerous==0.24        # via flask
 jinja2==2.10
 jmespath==0.9.3           # via boto3, botocore
-josepy==1.0.1             # via acme
+josepy==1.1.0             # via acme
 lockfile==0.12.2
 mako==1.0.7               # via alembic
 markupsafe==1.0           # via jinja2, mako
@@ -53,17 +53,17 @@ pyjwt==1.6.1
 pynacl==1.2.1             # via paramiko
 pyopenssl==17.2.0
 pyrfc3339==1.0            # via acme
-python-dateutil==2.6.1    # via alembic, arrow, botocore
+python-dateutil==2.7.2    # via alembic, arrow, botocore
 python-editor==1.0.3      # via alembic
 python-ldap==3.0.0
 pytz==2018.4              # via acme, flask-restful, pyrfc3339
-raven[flask]==6.6.0
+raven[flask]==6.7.0
 requests[security]==2.11.1
 retrying==1.3.3
 s3transfer==0.1.13        # via boto3
 six==1.11.0
 sqlalchemy-utils==0.33.2
-sqlalchemy==1.2.6         # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
+sqlalchemy==1.2.7         # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
 tabulate==0.8.2
 werkzeug==0.14.1          # via flask
 xmltodict==0.11.0