aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2015-03-27 07:06:17 +0100
committerCédric Bonhomme <cedric@cedricbonhomme.org>2015-03-27 07:06:17 +0100
commit4f568446b5c73d67548fd8cf0188070c999d9820 (patch)
treea9fef02ec5dac9da323db510c88d3f55bd48642e
parentDisplay the article id in the 'duplicates' page. (diff)
parentDon't ask for confirmation of uninstall deletions with pip. (diff)
downloadnewspipe-4f568446b5c73d67548fd8cf0188070c999d9820.tar.gz
newspipe-4f568446b5c73d67548fd8cf0188070c999d9820.tar.bz2
newspipe-4f568446b5c73d67548fd8cf0188070c999d9820.zip
Merge branch 'master' of bitbucket.org:cedricbonhomme/pyaggr3g470r
-rw-r--r--documentation/deployment.rst4
-rw-r--r--vagrant/bootstrap.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/documentation/deployment.rst b/documentation/deployment.rst
index 0402afd3..59080b89 100644
--- a/documentation/deployment.rst
+++ b/documentation/deployment.rst
@@ -14,8 +14,8 @@ Installation of VirtualBox and Vagrant
.. code-block:: bash
$ sudo apt-get install virtualbox
- $ wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.5_x86_64.deb
- $ sudo dpkg -i vagrant_1.6.5_x86_64.deb
+ $ wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.deb
+ $ sudo dpkg -i vagrant_1.7.2_x86_64.deb
Deployment of pyAggr3g470r
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
index 927a39b2..6952afc3 100644
--- a/vagrant/bootstrap.sh
+++ b/vagrant/bootstrap.sh
@@ -22,7 +22,7 @@ apt-get install -y libxml2-dev libxslt1-dev
sudo pip3 install --upgrade -r requirements.txt
wget https://raw.github.com/pypa/pip/master/contrib/get-pip.py
sudo python3 get-pip.py
-sudo pip3 uninstall feedparser
+sudo pip3 uninstall -y feedparser
sudo pip3 install feedparser==5.1.2
# copy of the default configuration files for vagrant
cp vagrant/conf.cfg-sample conf/conf.cfg
bgstack15