Skip to content

Commit 8cfbb9c

Browse files
fmv1992fmv1992
committed
Merge remote-tracking branch 'upstream/develop' into develop
2 parents a8dcbc8 + f7ccee5 commit 8cfbb9c

File tree

163 files changed

+1101
-17199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+1101
-17199
lines changed

‎.bumpversion.cfg‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
[bumpversion]
2+
commit = True
3+
current_version = 0.9.0
4+
files = plugin/pymode.vim
5+
tag = True
6+
tag_name = {new_version}
7+
8+
[bumpversion:file:doc/pymode.txt]
9+
search = Version: {current_version}
10+
replace = Version: {new_version}
11+

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ rvm:
44
- 1.9.3
55
script:
66
- make travis
7-

‎AUTHORS‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
Maintainer:
1+
Maintainers:
22

33
* Kirill Klenov <horneds@gmail.com>
4+
* Bryce Guinta (https://github.com/brycepg)
45

56

67
Contributors:
@@ -31,6 +32,7 @@ Contributors:
3132
* Lawrence Akka (https://github.com/lawrenceakka);
3233
* Lowe Thiderman (http://github.com/thiderman);
3334
* Martin Brochhaus (http://github.com/mbrochh);
35+
* Matt Dodge (https://github.com/mattdodge);
3436
* Matthew Moses (http://github.com/mlmoses);
3537
* Maxim (https://github.com/mpyatishev);
3638
* Mel Boyce (http://github.com/syngin);

‎Makefile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,31 @@ clean:
88
rm -rf $(CURDIR)/build
99
rm -rf *.deb
1010

11+
VERSION?=minor
12+
# target: release - Bump version
13+
release:
14+
git fetch origin
15+
git checkout master
16+
git rebase
17+
git merge develop
18+
bumpversion $(VERSION)
19+
git checkout develop
20+
git rebase
21+
git merge master
22+
git push origin develop master
23+
git push --tags
24+
25+
.PHONY: minor
26+
minor: release
27+
28+
.PHONY: patch
29+
patch:
30+
make release VERSION=patch
31+
32+
.PHONY: major
33+
major:
34+
make release VERSION=major
35+
1136
# Temporary disable rope tests on Travis
1237
.PHONY: travis
1338
travis:

‎README.rst‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66

77
-----
88

9-
*The project needs maintainers and contributors*
9+
*The project needs contributors*
1010

11-
Actually, I have no time for support the project, so if you feel yourself as
12-
strong don't be hesitate to contact me.
11+
** Python-mode Slack Channel is here: https://python-mode.herokuapp.com/ **
1312

1413
-----
1514

@@ -164,6 +163,22 @@ You can override the default key bindings by redefining them in your `.vimrc`, f
164163
let g:pymode_doc_bind = "<C-S-d>"
165164

166165

166+
Frequent Problems
167+
=================
168+
169+
Read this section before opening an issue on the tracker.
170+
171+
Python 3 Syntax
172+
---------------
173+
174+
By default python-mode uses python 2 syntax checking. To enable python 3
175+
syntax checking (e.g. for async) add::
176+
177+
let g:pymode_python = 'python3'
178+
179+
To your vimrc or exrc file
180+
181+
167182
Documentation
168183
=============
169184

@@ -181,7 +196,10 @@ at https://github.com/klen/python-mode/issues
181196
Contributing
182197
============
183198

184-
See the `AUTHORS` file.
199+
* Kirill Klenov (horneds@gmail.com)
200+
* Bryce Guinta (https://github.com/brycepg)
201+
202+
Also see the `AUTHORS` file.
185203

186204
Development of python-mode happens at github:
187205
https://github.com/klen/python-mode

‎autoload/pymode/breakpoint.vim‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,13 @@ fun! pymode#breakpoint#operate(lnum) "{{{
3535
normal dd
3636
else
3737
let plnum = prevnonblank(a:lnum)
38-
call append(line('.')-1, repeat(' ', indent(plnum)).g:pymode_breakpoint_cmd)
38+
if &expandtab
39+
let indents = repeat(' ', indent(plnum))
40+
else
41+
let indents = repeat("\t", plnum / &shiftwidth)
42+
endif
43+
44+
call append(line('.')-1, indents.g:pymode_breakpoint_cmd)
3945
normal k
4046
endif
4147

‎autoload/pymode/virtualenv.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fun! pymode#virtualenv#init() "{{{
1111

1212
endfunction "}}}
1313

14-
fun! pymode#virtualenv#activate(relpath) "{{{
15-
let g:pymode_virtualenv_path = getcwd() . '/' . a:relpath
14+
fun! pymode#virtualenv#activate(path) "{{{
15+
let g:pymode_virtualenv_path = a:path
1616
call pymode#virtualenv#init()
1717
endfunction "}}}

‎doc/pymode.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(__) (__) (__) (_) (_)(_____)(_)\_) (_/\/\_)(_____)(____/(____) ~
77

88

9-
Version: 0.8.1
9+
Version: 0.9.0
1010

1111
==============================================================================
1212
CONTENTS *pymode-contents*
@@ -212,8 +212,8 @@ Bind keys to show documentation for current word (selection)
212212
*pymode-virtualenv*
213213

214214
Commands:
215-
*:PymodeVirtualenv* <path> -- Activate virtualenv (path is related to
216-
current working directory)
215+
*:PymodeVirtualenv* <path> -- Activate virtualenv (path can be absolute or
216+
relative to current working directory)
217217

218218
Enable automatic virtualenv detection *'g:pymode_virtualenv'*
219219
>
@@ -486,7 +486,7 @@ imported) from project *'g:pymode_rope_autoimport'*
486486
487487
Load modules to autoimport by default *'g:pymode_rope_autoimport_modules'*
488488
>
489-
let g:pymode_rope_autoimport_modules = ['os', 'shutil', 'datetime'])
489+
let g:pymode_rope_autoimport_modules = ['os', 'shutil', 'datetime']
490490
491491
Offer to unresolved import object after completion.
492492
>

‎plugin/pymode.vim‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ call pymode#default("g:pymode_folding_nest_limit", 1000)
4141
" Change for folding customization (by example enable fold for 'if', 'for')
4242
call pymode#default("g:pymode_folding_regex", '^\s*\%(class\|def\|async\s\+def\) .\+\(:\s\+\w\)\@!')
4343

44-
4544
" Enable/disable python motion operators
4645
call pymode#default("g:pymode_motion", 1)
4746

‎pylama.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ linters=pep8,pyflakes,pylint
55
skip=1
66

77
[pylama:pylint]
8-
disable=E1120,E1130,E1103,W1401
8+
disable=E1120,E1130,E1103,W1401,F0001

0 commit comments

Comments
 (0)