Merge pull request deis#2315 from mboersma/update-python-requests

chore(*): update python requests to 2.4.3
sbuss · Oct 29, 2014 · 3c307ea · 3c307ea
2 parents 5985add + 57e650a
commit 3c307ea
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -35,7 +35,7 @@ RUN mkdir -p /var/run/sshd
 RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.6/contrib/get-pip.py | python -
 
 # install hook dependencies
-RUN pip install pyyaml==3.11 requests==2.4.1
+RUN pip install pyyaml==3.11 requests==2.4.3
 
 # configure locale
 RUN echo LANG="en_US.UTF-8" > /etc/default/locale && dpkg-reconfigure locales

diff --git a/client/Makefile b/client/Makefile
@@ -1,6 +1,6 @@
 
 build: setup-venv
-	venv/bin/pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 pyinstaller==2.1 termcolor==1.1.0
+	venv/bin/pip install docopt==0.6.2 python-dateutil==2.2 requests==2.4.3 pyinstaller==2.1 termcolor==1.1.0
 	venv/bin/pyinstaller deis.spec
 	chmod +x dist/deis
 

diff --git a/client/README.rst b/client/README.rst
@@ -75,7 +75,7 @@ you used to provision the server. You can make a symlink or shell alias for
 
 .. code-block:: console
 
-    $ pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 termcolor==1.1.0
+    $ pip install docopt==0.6.2 python-dateutil==2.2 requests==2.4.3 termcolor==1.1.0
     $ sudo ln -fs $(pwd)/client/deis.py /usr/local/bin/deis
     $ deis
     Usage: deis <command> [<args>...]

diff --git a/client/setup.py b/client/setup.py
@@ -57,7 +57,7 @@
       ],
       long_description=LONG_DESCRIPTION,
       install_requires=[
-          'docopt==0.6.2', 'python-dateutil==2.2', 'requests==2.3.0', 'termcolor==1.1.0'
+          'docopt==0.6.2', 'python-dateutil==2.2', 'requests==2.4.3', 'termcolor==1.1.0'
       ],
       zip_safe=True,
       **KWARGS)
diff --git a/controller/dev_requirements.txt b/controller/dev_requirements.txt
@@ -1,13 +1,14 @@
 # Deis client requirements
 docopt==0.6.2
 python-dateutil==2.2
-requests==2.3.0
+requests==2.4.3
+termcolor==1.1.0
 
 # PyInstaller builds client binaries
 PyInstaller==2.1
 
 # Deis documentation requirements
-Sphinx>=1.2.2
+Sphinx>=1.2.3
 smartypants>=1.8.6
 sphinxcontrib-httpdomain>=1.3.0
 

diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -24,7 +24,7 @@ South==1.0
 # Deis client requirements
 docopt==0.6.2
 python-dateutil==2.2
-requests==2.3.0
+requests==2.4.3
 termcolor==1.1.0
 
 # Deis documentation requirements

diff --git a/docs/using_deis/install-client.rst b/docs/using_deis/install-client.rst
@@ -17,7 +17,7 @@ you used to provision the server. You can make a symlink or shell alias for
 
 .. code-block:: console
 
-    $ pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 termcolor==1.1.0
+    $ pip install docopt==0.6.2 python-dateutil==2.2 requests==2.4.3 termcolor==1.1.0
     $ sudo ln -fs $(pwd)/client/deis.py /usr/local/bin/deis
     $ deis
     Usage: deis <command> [<args>...]

diff --git a/tests/bin/build-deis-cli.sh b/tests/bin/build-deis-cli.sh
@@ -4,5 +4,5 @@
 
 virtualenv --system-site-packages venv
 . venv/bin/activate
-pip install docopt==0.6.2 python-dateutil==2.2 requests==2.3.0 pyinstaller==2.1 termcolor==1.1.0
+pip install docopt==0.6.2 python-dateutil==2.2 requests==2.4.3 pyinstaller==2.1 termcolor==1.1.0
 make -C client/ client