From 76ff9e3f2097771cd23612fc12be3d6cf3f1a970 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Thu, 25 Jul 2013 22:25:22 +0200 Subject: [PATCH 1/7] s/svaiter/srusskih/g --- README.rst | 2 +- docs/index.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 096b3cd4..815c72d8 100644 --- a/README.rst +++ b/README.rst @@ -131,5 +131,5 @@ For more detailed information visit the `testing documentation .. _jedi-vim: https://github.com/davidhalter/jedi-vim .. _youcompleteme: http://valloric.github.io/YouCompleteMe/ .. _Jedi.el: https://github.com/tkf/emacs-jedi -.. _sublimejedi: https://github.com/svaiter/SublimeJEDI +.. _sublimejedi: https://github.com/srusskih/SublimeJEDI .. _wdb: https://github.com/Kozea/wdb diff --git a/docs/index.rst b/docs/index.rst index 8d0e24d5..43006d99 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -56,7 +56,7 @@ Emacs: Sublime Text 2/3: -- `SublimeJEDI `_ +- `SublimeJEDI `_ .. _other-software: From a0d8b4b5080cd5595d56dae04e6eecce83da74c9 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Thu, 25 Jul 2013 18:41:53 -0500 Subject: [PATCH 2/7] PuDB's post_mortem is now consistant with pdb (https://github.com/inducer/pudb/pull/71) --- sith.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sith.py b/sith.py index 42805c6f..7f3c9e0e 100755 --- a/sith.py +++ b/sith.py @@ -112,7 +112,7 @@ class TestCase(object): if debugger: einfo = sys.exc_info() pdb = __import__(debugger) - pdb.post_mortem(einfo if debugger == 'pudb' else einfo[2]) + pdb.post_mortem(einfo[2]) exit(1) def show(self): From 783f71501e1dc0da5607540cc992663c31488207 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Thu, 25 Jul 2013 19:00:02 -0500 Subject: [PATCH 3/7] Give all the necessary traceback info when using PuDB --- sith.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sith.py b/sith.py index 7f3c9e0e..a27197f8 100755 --- a/sith.py +++ b/sith.py @@ -112,7 +112,10 @@ class TestCase(object): if debugger: einfo = sys.exc_info() pdb = __import__(debugger) - pdb.post_mortem(einfo[2]) + if debugger == 'pudb': + pdb.post_mortem(einfo[2], einfo[0], einfo[1]) + else: + pdb.post_mortem(einfo[2]) exit(1) def show(self): From 42e1737be3776338063bcda94fd0e3fa470e6e80 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Thu, 25 Jul 2013 21:58:54 -0500 Subject: [PATCH 4/7] Don't require distribute in setup.py It isn't actually required to install (it's only needed if you want to setup.py develop). Fixes #269. --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 63707746..73e87e9b 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,11 @@ #!/usr/bin/env python from __future__ import with_statement -from setuptools import setup +try: + from setuptools import setup +except ImportError: + # Distribute is not actually required to install + from distutils.core import setup __AUTHOR__ = 'David Halter' __AUTHOR_EMAIL__ = 'davidhalter88@gmail.com' From 6e649c1a67c7341258141d46733da6e39cf0a4e4 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Fri, 26 Jul 2013 16:07:16 +0200 Subject: [PATCH 5/7] Added `hub pull-request` info to CONTRIBUTING.md --- CONTRIBUTING.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d0a06573..69d3ea86 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,8 +6,16 @@ are ok in the master branch. 3. Add your name to AUTHORS.txt 4. Push to your fork and submit a **pull request to the dev branch**. +If you have have previously filed a GitHub issue and want to contribute code +that addresses that issue, we prefer it if you use +[hub](https://github.com/github/hub) to convert your existing issue to a pull +request. To do that, first push the changes to a separate branch in your fork +and then issue the following command: + + hub pull-request -b davidhalter:dev -i -h : + My **master** branch is a 100% stable (should be). I only push to it after I am certain that things are working out. Many people are using Jedi directly from the github master branch. -Please use Pep8 to style your code. +Please use PEP8 to style your code. From acf068fb21e333d5538092cf9e9356e98d92273e Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Fri, 26 Jul 2013 16:09:52 +0200 Subject: [PATCH 6/7] hub is no requirement --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 69d3ea86..3ff9f7e2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,6 +14,9 @@ and then issue the following command: hub pull-request -b davidhalter:dev -i -h : +It's no strict requirement though, if you don't have hub installed or prefer to +use the web interface, then feel free to post a traditional pull request. + My **master** branch is a 100% stable (should be). I only push to it after I am certain that things are working out. Many people are using Jedi directly from the github master branch. From 9c4c36ce6a328bfcc46c83f5df46c96e6df6f119 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 26 Jul 2013 09:34:33 -0500 Subject: [PATCH 7/7] Add myself to AUTHORS --- AUTHORS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.txt b/AUTHORS.txt index fd56fb22..34cd212b 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -16,3 +16,4 @@ Yasha Borevich (@jjay) Aaron Griffin andviro (@andviro) Mike Gilbert (@floppym) +Aaron Meurer (@asmeurer)