mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Merge branch 'django1.8' into django1.9
* django1.8: Only warn on old systems with broken swapfile. httplib2 causing pip issues. De-vendorizing paypal.
This commit is contained in:
commit
f1cc411ab7
2 changed files with 4 additions and 2 deletions
|
@ -12,6 +12,7 @@ django-cors-middleware==1.3.1
|
|||
django-extensions==1.6.7
|
||||
django-mailgun==0.9.1
|
||||
django-oauth-toolkit==0.10.0
|
||||
django-paypal==0.5.0
|
||||
django-qurl==0.1.1
|
||||
django-paypal==1.0
|
||||
django-redis-cache==1.7.1
|
||||
|
@ -24,7 +25,7 @@ dnspython==1.15.0
|
|||
Fabric==1.14.0
|
||||
gunicorn==19.7
|
||||
hiredis==0.2.0
|
||||
httplib2==0.18.1
|
||||
httplib2==0.17.4
|
||||
image==1.5.27
|
||||
isodate==0.5.4
|
||||
lxml==3.6.4
|
||||
|
|
3
fabfile.py
vendored
3
fabfile.py
vendored
|
@ -504,7 +504,8 @@ def pip():
|
|||
run('easy_install -U pip')
|
||||
run('pip install --upgrade pip')
|
||||
run('pip install -r requirements.txt')
|
||||
sudo('swapoff /swapfile')
|
||||
with settings(warn_only=True):
|
||||
sudo('swapoff /swapfile')
|
||||
|
||||
def solo_pip(role):
|
||||
if role == "app":
|
||||
|
|
Loading…
Add table
Reference in a new issue