From f9e8be5d0ca72b68c22e32cc99a5d48fa3357654 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 18 Jun 2014 21:24:50 +0300 Subject: [PATCH 1/2] INSTALL.md: add installing requirements under pip. It seems that pip ignores `requirements.txt` unless it's installed separately. --- INSTALL.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index b4389d3c4..354a9104f 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -130,12 +130,14 @@ To install with pip run ``` sudo pip install git+https://github.com/ProgVal/Limnoria.git@master +sudo pip install -r https://raw.githubusercontent.com/ProgVal/Limnoria/master/requirements.txt ``` or without root if you don't have it or don't want to use it. ``` pip install git+https://github.com/ProgVal/Limnoria.git@master --user +pip install -r https://raw.githubusercontent.com/ProgVal/Limnoria/master/requirements.txt --user ``` If you wish to use Python 3 or 2 instead of default of your distribution @@ -166,7 +168,8 @@ sudo dpkg -i limnoria-master-HEAD.deb ### Pip -Run the install command again. +Run the first install command again. To upgrade requirements, add `--upgrade` to +the end of the second command ## Upgrading to Python 3 From f1ebccb9f1183a6553072a11d7468d230524f808 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 18 Jun 2014 21:31:19 +0300 Subject: [PATCH 2/2] INSTALL: install requirements with pip before Limnoria itself. [SKIP CI] --- INSTALL.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 354a9104f..92f5425c9 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -129,15 +129,15 @@ sudo dpkg -i limnoria-master-HEAD.deb To install with pip run ``` -sudo pip install git+https://github.com/ProgVal/Limnoria.git@master sudo pip install -r https://raw.githubusercontent.com/ProgVal/Limnoria/master/requirements.txt +sudo pip install git+https://github.com/ProgVal/Limnoria.git@master ``` or without root if you don't have it or don't want to use it. ``` -pip install git+https://github.com/ProgVal/Limnoria.git@master --user pip install -r https://raw.githubusercontent.com/ProgVal/Limnoria/master/requirements.txt --user +pip install git+https://github.com/ProgVal/Limnoria.git@master --user ``` If you wish to use Python 3 or 2 instead of default of your distribution @@ -168,8 +168,8 @@ sudo dpkg -i limnoria-master-HEAD.deb ### Pip -Run the first install command again. To upgrade requirements, add `--upgrade` to -the end of the second command +Run the first install command again, but add `--upgrade` to the +end. Then run the second install command. ## Upgrading to Python 3