From eb73ddd301b2251e44163f78eb834f5fcbd96e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= Date: Sun, 19 Jan 2014 19:12:07 -0200 Subject: [PATCH 1/3] Update Ubuntu installation instructions --- docs/topics/ubuntu.rst | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/docs/topics/ubuntu.rst b/docs/topics/ubuntu.rst index fb51fd674..c3e62ee98 100644 --- a/docs/topics/ubuntu.rst +++ b/docs/topics/ubuntu.rst @@ -11,39 +11,27 @@ those in Ubuntu, and more stable too since they're continuously built from `Github repo`_ (master & stable branches) and so they contain the latest bug fixes. -To use the packages, just add the following line to your -``/etc/apt/sources.list``, and then run ``aptitude update`` and -``apt-get install scrapy-0.22``:: +To use the packages: - deb http://archive.scrapy.org/ubuntu DISTRO main +1. Import the GPG key used to sign Scrapy packages into APT keyring. -Replacing ``DISTRO`` with the name of your Ubuntu release, which you can get -with command:: + sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 627220E7 - lsb_release -cs +2. Create `/etc/apt/sources.list.d/scrapy.list` file using the following command. -Supported Ubuntu releases are: ``precise``, ``quantal``, ``raring``. + echo 'deb http://archive.scrapy.org/ubuntu scrapy main' | sudo tee /etc/apt/sources.list.d/scrapy.list -For Ubuntu Raring (13.04):: +3. Update package lists and install `scrapy-VERSION`, replace `VERSION` by a + known Scrapy version (i.e.: `scrapy-0.22`) - deb http://archive.scrapy.org/ubuntu raring main - -For Ubuntu Quantal (12.10):: - - deb http://archive.scrapy.org/ubuntu quantal main - -For Ubuntu Precise (12.04):: - - deb http://archive.scrapy.org/ubuntu precise main + sudo apt-get update sudo apt-get install scrapy-VERSION .. warning:: Please note that these packages are updated frequently, and so if you find you can't download the packages, try updating your apt package - lists first, e.g., with ``apt-get update`` or ``aptitude update``. + lists first, e.g., with ``apt-get update``. -The public GPG key used to sign these packages can be imported into you APT -keyring as follows:: - - curl -s http://archive.scrapy.org/ubuntu/archive.key | sudo apt-key add - +.. warning:: `python-scrapy` is a different package provided by official debian + repositories, it's very outdated and it isn't supported by Scrapy team. .. _Scrapinghub: http://scrapinghub.com/ .. _Github repo: https://github.com/scrapy/scrapy From 52c3ff91906357bd6cac2158b9bc0d1504450d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= Date: Mon, 20 Jan 2014 14:39:26 -0200 Subject: [PATCH 2/3] fix apt-get line --- docs/topics/ubuntu.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/topics/ubuntu.rst b/docs/topics/ubuntu.rst index c3e62ee98..66b8196b3 100644 --- a/docs/topics/ubuntu.rst +++ b/docs/topics/ubuntu.rst @@ -24,7 +24,7 @@ To use the packages: 3. Update package lists and install `scrapy-VERSION`, replace `VERSION` by a known Scrapy version (i.e.: `scrapy-0.22`) - sudo apt-get update sudo apt-get install scrapy-VERSION + sudo apt-get update && sudo apt-get install scrapy-VERSION .. warning:: Please note that these packages are updated frequently, and so if you find you can't download the packages, try updating your apt package From ebfb5b70968c83a242094ca0f0f57239638b003a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= Date: Mon, 20 Jan 2014 15:18:34 -0200 Subject: [PATCH 3/3] replace warning about updating package lists by a note on package upgrade --- docs/topics/ubuntu.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/topics/ubuntu.rst b/docs/topics/ubuntu.rst index 66b8196b3..c0e3f547b 100644 --- a/docs/topics/ubuntu.rst +++ b/docs/topics/ubuntu.rst @@ -26,9 +26,7 @@ To use the packages: sudo apt-get update && sudo apt-get install scrapy-VERSION -.. warning:: Please note that these packages are updated frequently, and so if - you find you can't download the packages, try updating your apt package - lists first, e.g., with ``apt-get update``. +.. note:: Repeat step 3 if you are trying to upgrade Scrapy. .. warning:: `python-scrapy` is a different package provided by official debian repositories, it's very outdated and it isn't supported by Scrapy team.