From c397317e8b34119d4c92aa93a90e7d90f4f35d23 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Tue, 3 Jun 2014 21:01:36 +0300 Subject: [PATCH 1/4] INSTALL.md: fix pip instructions. * pip has `--user`, `--install-option` just confuses people. * pip user installation happens by `pip install limnoria --user`. --- INSTALL.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index b2827c043..88efcd9df 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -27,7 +27,7 @@ To install them, run or if you don't have or don't want to use root, -`pip install -r requirements.txt --install-option=--prefix=$HOME/.local` +`pip install -r requirements.txt --user` For more information and help on how to use Supybot, checkout the documents under [docs/], especially [GETTING_STARTED] and @@ -132,6 +132,12 @@ To install with pip run sudo pip install limnoria ``` +or without root if you don't have it or don't want to use it. + +``` +pip install limnoria --user +``` + If you wish to use Python 3 or 2 instead of default of your distribution run `pipX` where X is either 2 or 3 instead of `pip`. From d8e992d727c8f35aa0e579bcc220bdf021d8e7e3 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 4 Jun 2014 15:33:24 +0300 Subject: [PATCH 2/4] INSTALL.md: Tell pip to install from git master. [SKIP CI] --- INSTALL.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 88efcd9df..39ea9db32 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -129,13 +129,13 @@ sudo dpkg -i limnoria-master-HEAD.deb To install with pip run ``` -sudo pip install limnoria +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 limnoria --user +pip install git+https://github.com/ProgVal/Limnoria.git@testing --user ``` If you wish to use Python 3 or 2 instead of default of your distribution @@ -164,13 +164,9 @@ wget http://builds.progval.net/limnoria/limnoria-master-HEAD.deb sudo dpkg -i limnoria-master-HEAD.deb ``` -### Pip +### Pip -To update with pip, add `--upgrade` to the end of the command: - -``` -pip install limnoria --upgrade -``` +Run the install command again. ## Upgrading to Python 3 From f354aa4a688d27be7d712185b2ef7add90da81b5 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 4 Jun 2014 15:36:25 +0300 Subject: [PATCH 3/4] INSTALL.md: clone using HTTPS instead of GIT. GitHub seems to be removing the `git://` links. Changing to `https://` in case they are going to discontinue `git://`. [SKIP CI] --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 39ea9db32..a1adf98c1 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -60,7 +60,7 @@ libs are installed), then you will need a python-dev or python3-dev package. First start by git cloning Limnoria and moving to the cloned repository. ``` -git clone git://github.com/ProgVal/Limnoria.git +git clone https://github.com/ProgVal/Limnoria.git cd Limnoria ``` From 42fd986da3faea61168cc87f7f15cd39258f23aa Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 4 Jun 2014 15:39:11 +0300 Subject: [PATCH 4/4] INSTALL.md: fix copy-pasting. [SKIP CI] --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index a1adf98c1..b4389d3c4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -135,7 +135,7 @@ 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@testing --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