Skip to content

Commit da0e7d6

Browse files
committed
Merge pull request #491 from opdemand/pypi-updates
Updated celery, requests, Sphinx.
2 parents b7751ab + d601fd8 commit da0e7d6

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

client/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
long_description=LONG_DESCRIPTION,
5959
install_requires=[
6060
'docopt==0.6.1', 'python-dateutil==2.2',
61-
'PyYAML==3.10', 'requests==2.2.0'
61+
'PyYAML==3.10', 'requests==2.2.1'
6262
],
6363
zip_safe=True,
6464
**KWARGS)

dev_requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Deis controller requirements
22
boto==2.23.0
3-
celery==3.1.7
3+
celery==3.1.8
44
Django==1.6.1
55
django-allauth==0.15.0
66
django-guardian==1.1.1
@@ -21,10 +21,10 @@ South==0.8.4
2121
docopt==0.6.1
2222
python-dateutil==2.2
2323
#PyYAML==3.10
24-
requests==2.2.0
24+
requests==2.2.1
2525

2626
# Deis documentation requirements
27-
Sphinx>=1.2
27+
Sphinx>=1.2.1
2828
smartypants>=1.8.3
2929
sphinxcontrib-httpdomain>=1.2.0
3030

@@ -38,4 +38,4 @@ docutils>=0.11
3838
flake8>=2.1.0
3939

4040
# Python expect is used to automate client-driven tests
41-
pexpect>=3.0
41+
pexpect>=3.1

docs/docs_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Deis requirements for Sphinx documentation generation
22
boto==2.23.0
3-
celery==3.1.7
3+
celery==3.1.8
44
Django==1.6.1
55
django-json-field==0.5.5
66
djangorestframework==2.3.12
@@ -13,6 +13,6 @@ PyYAML==3.10
1313
docopt==0.6.1
1414

1515
# Deis documentation requirements
16-
Sphinx>=1.2
16+
Sphinx>=1.2.1
1717
smartypants>=1.8.3
1818
sphinxcontrib-httpdomain>=1.2.0

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Deis controller requirements
22
boto==2.23.0
3-
celery==3.1.7
3+
celery==3.1.8
44
Django==1.6.1
55
django-allauth==0.15.0
66
django-guardian==1.1.1

0 commit comments

Comments
 (0)