From 6d1a33a3c76da488eddb7382d84f83002c875d24 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Wed, 15 May 2013 23:27:16 +0200 Subject: [PATCH 1/5] Added python2 AUR package --- docs/docs/installation.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/docs/installation.rst b/docs/docs/installation.rst index 35cc4bc3..77331322 100644 --- a/docs/docs/installation.rst +++ b/docs/docs/installation.rst @@ -30,8 +30,10 @@ System-wide installation via a package manager Arch Linux ~~~~~~~~~~ -You can install jedi directly from AUR: `python-jedi at AUR -`__. +You can install jedi directly from official AUR packages: + +- `python-jedi `__. +- `python2-jedi `__. (There is also a packaged version of the vim plugin available: `vim-jedi at AUR `__.) From 5c5f93d69eec37c00accf2f2f755b42faefa9294 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Wed, 15 May 2013 23:28:20 +0200 Subject: [PATCH 2/5] Typo in docs --- docs/docs/installation.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/docs/installation.rst b/docs/docs/installation.rst index 77331322..22eeab11 100644 --- a/docs/docs/installation.rst +++ b/docs/docs/installation.rst @@ -32,8 +32,8 @@ Arch Linux You can install jedi directly from official AUR packages: -- `python-jedi `__. -- `python2-jedi `__. +- `python-jedi `__ +- `python2-jedi `__ (There is also a packaged version of the vim plugin available: `vim-jedi at AUR `__.) From 16de02023fc9423fcf654c91b21326c6470398e3 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Wed, 15 May 2013 23:29:13 +0200 Subject: [PATCH 3/5] Use |jedi| macro in docs more consistently --- docs/docs/installation.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/docs/installation.rst b/docs/docs/installation.rst index 22eeab11..f756702c 100644 --- a/docs/docs/installation.rst +++ b/docs/docs/installation.rst @@ -30,7 +30,7 @@ System-wide installation via a package manager Arch Linux ~~~~~~~~~~ -You can install jedi directly from official AUR packages: +You can install |jedi| directly from official AUR packages: - `python-jedi `__ - `python2-jedi `__ @@ -47,7 +47,7 @@ Debian packages are available as `experimental packages Others ~~~~~~ -We are in the discussion of adding Jedi to the Fedora repositories. +We are in the discussion of adding |jedi| to the Fedora repositories. Manual installation from a downloaded package @@ -55,7 +55,7 @@ Manual installation from a downloaded package If you prefer not to use an automated package installer, you can `download `__ a current copy of -*Jedi* and install it manually. +|jedi| and install it manually. To install it, navigate to the directory containing `setup.py` on your console and type:: From 6ed0e1580b9860faf6fab78d9d9a511f969f4b11 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Wed, 15 May 2013 23:31:46 +0200 Subject: [PATCH 4/5] Added remark about Python versions to installation docs --- docs/docs/installation.rst | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/docs/installation.rst b/docs/docs/installation.rst index f756702c..49181e80 100644 --- a/docs/docs/installation.rst +++ b/docs/docs/installation.rst @@ -32,8 +32,13 @@ Arch Linux You can install |jedi| directly from official AUR packages: -- `python-jedi `__ -- `python2-jedi `__ +- `python-jedi `__ (Python 3) +- `python2-jedi `__ (Python 2) + +The specified Python version just refers to the *runtime environment* for +|jedi|. Use the Python 2 version if you're running vim (or whatever editor oyu +use) under Python 2. Otherwise, use the Python 3 version. But whatever version +you choose, both are able to complete both Python 2 and 3 *code*. (There is also a packaged version of the vim plugin available: `vim-jedi at AUR `__.) From e1afe2e80d0bb4e8d3ee481d6e0ca7229c2eaf1b Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Wed, 15 May 2013 23:33:14 +0200 Subject: [PATCH 5/5] Small docs changes --- docs/docs/development.rst | 2 ++ docs/docs/installation.rst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/docs/development.rst b/docs/docs/development.rst index a6a8b3d1..9d40c0b0 100644 --- a/docs/docs/development.rst +++ b/docs/docs/development.rst @@ -64,6 +64,8 @@ Parser Representation (parser_representation.py) .. automodule:: parsing_representation +Class inheritance diagram: + .. inheritance-diagram:: SubModule Class diff --git a/docs/docs/installation.rst b/docs/docs/installation.rst index 49181e80..44cedfd6 100644 --- a/docs/docs/installation.rst +++ b/docs/docs/installation.rst @@ -36,7 +36,7 @@ You can install |jedi| directly from official AUR packages: - `python2-jedi `__ (Python 2) The specified Python version just refers to the *runtime environment* for -|jedi|. Use the Python 2 version if you're running vim (or whatever editor oyu +|jedi|. Use the Python 2 version if you're running vim (or whatever editor you use) under Python 2. Otherwise, use the Python 3 version. But whatever version you choose, both are able to complete both Python 2 and 3 *code*.