Skip to content

Commit 72cffc9

Browse files
author
boatx
committed
Merge branch 'develop' into bugfix/issue-728
2 parents 4c045e2 + 2ae7a23 commit 72cffc9

File tree

223 files changed

+19929
-37590
lines changed

Some content is hidden

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

223 files changed

+19929
-37590
lines changed

‎.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[bumpversion]
22
commit = True
3-
current_version = 0.9.2
3+
current_version = 0.9.5
44
files = plugin/pymode.vim
55
tag = True
66
tag_name = {new_version}

‎.github/stale.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 150
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 21
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: inactive
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: >
18+
Closed due to inactivity.

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ test.py
1515
todo.txt
1616
vendor
1717
vim.py
18+
vim_session_*.vim
19+
__*/

‎.gitmodules

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
[submodule "submodules/autopep8"]
2+
path = submodules/autopep8
3+
url = https://github.com/hhatto/autopep8
4+
ignore = dirty
5+
[submodule "submodules/pycodestyle"]
6+
path = submodules/pycodestyle
7+
url = https://github.com/PyCQA/pycodestyle
8+
ignore = dirty
9+
[submodule "submodules/pydocstyle"]
10+
path = submodules/pydocstyle
11+
url = https://github.com/PyCQA/pydocstyle
12+
ignore = dirty
13+
[submodule "submodules/mccabe"]
14+
path = submodules/mccabe
15+
url = https://github.com/PyCQA/mccabe
16+
ignore = dirty
17+
[submodule "submodules/pyflakes"]
18+
path = submodules/pyflakes
19+
url = https://github.com/PyCQA/pyflakes
20+
ignore = dirty
21+
[submodule "submodules/snowball_py"]
22+
path = submodules/snowball_py
23+
url = https://github.com/shibukawa/snowball_py
24+
ignore = dirty
25+
[submodule "submodules/pylama"]
26+
path = submodules/pylama
27+
url = https://github.com/fmv1992/pylama
28+
ignore = dirty

‎.ruby-gemset

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.travis.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1-
language: ruby
2-
python: "2.7"
3-
rvm:
4-
- 1.9.3
5-
script:
6-
- make travis
1+
# Build vim from source with python3 support and execute tests.
2+
branches:
3+
only:
4+
- develop
5+
before_install:
6+
- export ORIGINAL_FOLDER=$PWD
7+
- sudo apt install libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev python3-dev lua5.1 lua5.1-dev libperl-dev git
8+
- sudo apt remove vim vim-runtime gvim
9+
- cd /tmp
10+
- git clone https://github.com/vim/vim.git
11+
- cd vim
12+
- ./configure --with-features=huge --enable-multibyte --enable-python3interp=yes --with-python3-config-dir=/usr/lib/python3.5/config --enable-perlinterp=yes --enable-luainterp=yes --enable-gui=gtk2 --enable-cscope --prefix=/usr/local
13+
- sudo make && sudo make install
14+
- cd $ORIGINAL_FOLDER
15+
install: git clone --recursive https://github.com/python-mode/python-mode
16+
script: vim --version && cd ./tests && bash -x ./test.sh

‎AUTHORS

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
Maintainers:
1+
Author:
22

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

5+
Maintainers:
6+
7+
* Felipe M. Vieira (https://github.com/fmv1992)
68

79
Contributors:
810

@@ -15,9 +17,11 @@ Contributors:
1517
* Boris Filippov (http://github.com/frenzykryger);
1618
* Brad Mease (http://github.com/bmease)
1719
* Brendan Maguire (https://github.com/brendanmaguire)
20+
* Bryce Guinta (https://github.com/brycepg)
1821
* Daniel Hahler (http://github.com/blueyed)
1922
* David Vogt (http://github.com/winged);
2023
* Denis Kasak (http://github.com/dkasak);
24+
* Diego Rabatone Oliveira (https://github.com/diraol)
2125
* Dimitrios Semitsoglou-Tsiapos (https://github.com/dset0x);
2226
* Dirk Wallenstein (http://github.com/dirkwallenstein);
2327
* Florent Xicluna (http://github.com/florentx);

‎Changelog.rst

Lines changed: 50 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,48 @@
11
Changelog
22
=========
33

4+
5+
## TODO
6+
-------
7+
* Move changelog rst syntax to markdown
8+
* pymode_rope: check disables
9+
* When loading a file without a history, substituting a word (eg 'cw') moves
10+
the cursor to position 0 (equivalent to 'cw' then '0l')
11+
* Fixed on `917e484`
12+
* Inspect why files starting with:
13+
~~~~~~
14+
def main():
15+
pass
16+
17+
18+
if __name__ == '__main__':
19+
main()
20+
~~~~~~
21+
do not get loaded.
22+
23+
24+
## 2017-07-xxx 0.9.5
25+
--------------------
26+
* pylama: migrated to submodule
27+
28+
29+
## 2017-07-11 0.9.4
30+
--------------------
31+
* pylama: fixed erratic behavior of `skip` option causing unintended skipping
32+
of lint checkers
33+
* PEP257 requires `snowbalstemmer`: added as submodule
34+
* Fixed handling of `g:pymode_lint_ignore` and `g:pymode_lint_select`: from
35+
strings to list
36+
* Migrated modules from `pymode/libs` to `submodules/ <https://github.com/fmv1992/python-mode/tree/develop/submodules>`__
37+
* Rationale: no need to single handedly update each module; removes burden
38+
from developers
39+
* Improved folding accuracy
40+
* Improved nested definitions folding
41+
* Improved block delimiting
42+
43+
44+
## (changelog poorly maintained) 0.8.2
45+
--------------------------------------
446
* Pylama updated to version 5.0.5
547
* Rope libs updated
648
* Add wdb to debugger list in breakpoint cmd
@@ -140,7 +182,7 @@ Changelog
140182
--------------------
141183
* Dont raise an exception when Logger has no message handler (c) nixon
142184
* Improve performance of white space removal (c) Dave Smith
143-
* Improve ropemode support (c) s0undt3ch
185+
* Improve ropemode support (c) s0undt3ch
144186
* Add `g:pymode_updatetime` option
145187
* Update autopep8 to version 0.8.1
146188

@@ -151,7 +193,7 @@ Changelog
151193

152194
## 2012-09-06 0.6.8
153195
-------------------
154-
* Add PEP8 indentation ":help 'pymode_indent'"
196+
* Add PEP8 indentation ":help 'pymode_indent'"
155197

156198
## 2012-08-15 0.6.7
157199
-------------------
@@ -165,7 +207,7 @@ Changelog
165207
* Fixed virtualenv support for windows users
166208
* Added pymode modeline ':help PythonModeModeline'
167209
* Added diagnostic tool ':call pymode#troubleshooting#Test()'
168-
* Added `PyLintAuto` command ':help PyLintAuto'
210+
* Added `PyLintAuto` command ':help PyLintAuto'
169211
* Code checking is async operation now
170212
* More, more fast the pymode folding
171213
* Repaired execution of python code
@@ -191,12 +233,12 @@ Changelog
191233

192234
## 2012-03-13 0.6.0
193235
-------------------
194-
* Add 'pymode_lint_hold' option
236+
* Add 'pymode_lint_hold' option
195237
* Improve pymode loading speed
196238
* Add pep8, mccabe lint checkers
197239
* Now g:pymode_lint_checker can have many values
198240
Ex. "pep8,pyflakes,mccabe"
199-
* Add 'pymode_lint_ignore' and 'pymode_lint_select' options
241+
* Add 'pymode_lint_ignore' and 'pymode_lint_select' options
200242
* Fix rope keys
201243
* Fix python motion in visual mode
202244
* Add folding 'pymode_folding'
@@ -258,6 +300,9 @@ Changelog
258300
-------------------
259301
* Enable all syntax highlighting
260302
For old settings set in your vimrc:
303+
304+
::
305+
261306
let g:pymode_syntax_builtin_objs = 0
262307
let g:pymode_syntax_builtin_funcs = 0
263308

‎Gemfile

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)