Commit graph

4898 commits

Author SHA1 Message Date
Bob Hyman
13912e90b9 manual merge 2016-08-31 20:09:14 -04:00
Morten Enemark Lund
703a8d9bcb Merge pull request #1624 from xonsh/tilde
more tilde expansions
2016-08-31 18:33:32 +02:00
Anthony Scopatz
a0e2d9a2d4 fixed conflicts 2016-08-31 01:37:14 -04:00
Konstantinos Tsakiltzidis
9754098e42 Merge pull request #1644 from xonsh/msub
Subprocess Macros
2016-08-31 04:00:07 +03:00
Anthony Scopatz
914d6038ec Merge pull request #1643 from xonsh/better_ptk_completion_display
Better ptk completion display
2016-08-29 23:10:31 -04:00
Konstantinos Tsakiltzidis
0b27499490 Merge pull request #1386 from xonsh/test_xsh
Collecting `test*.xsh` files when testing
2016-08-30 03:01:36 +03:00
Anthony Scopatz
b3f13582d9 Merge pull request #1650 from blahgeek/fix-path-completion
fix path completion for empty directories
2016-08-29 19:53:59 -04:00
Anthony Scopatz
c147feb884 Merge pull request #1640 from laerus/hist
History indexing API
2016-08-29 19:38:11 -04:00
Anthony Scopatz
c9b6667aec some typos 2016-08-29 19:35:09 -04:00
Anthony Scopatz
e700027466 Merge branch 'master' into msub 2016-08-29 19:33:49 -04:00
Morten Enemark Lund
c1f08ad66d Change import form back to import xonsh.imphooks 2016-08-30 00:22:26 +02:00
Morten Enemark Lund
37dc751478 Add header to pytest_plugin.py file 2016-08-30 00:09:33 +02:00
Morten Enemark Lund
770a6f3864 Remove pytest plugin registration from conftest file. It is not necessary when registered in setup.py 2016-08-30 00:08:58 +02:00
Morten Enemark Lund
8a7ecc6f33 Exclude pytest_plugin from amalgamate 2016-08-30 00:02:45 +02:00
Morten Enemark Lund
af232e47aa Flake 8 fixes 2016-08-29 21:24:14 +02:00
Anthony Scopatz
2f11ac657b Merge pull request #1648 from astronouth7303/vox-events
Add events to Vox
2016-08-29 13:09:24 -04:00
laerus
d4fa6a0952 staticmethod 2016-08-29 19:30:47 +03:00
Anthony Scopatz
3f5882d63d Merge branch 'master' into msub 2016-08-29 12:17:18 -04:00
Anthony Scopatz
1f5a8e9912 Merge pull request #1651 from laerus/linuxguide
linux guide update
2016-08-29 12:12:23 -04:00
laerus
1b948bdb76 Merge branch 'master' of https://github.com/xonsh/xonsh into hist 2016-08-29 16:52:36 +03:00
laerus
40dcc4d7d5 news fix 2016-08-29 16:38:29 +03:00
Morten Enemark Lund
0dd798071d Update pytest plugin to always run xsh tests first 2016-08-29 15:28:52 +02:00
laerus
70b802da33 linux guide update 2016-08-29 15:56:43 +03:00
laerus
295e04a7c4 typo 2016-08-29 13:46:22 +03:00
laerus
500963ae8b get_portions 2016-08-29 13:42:40 +03:00
Morten Enemark Lund
06ea1dac73 Update changelog 2016-08-29 08:48:28 +02:00
Morten Enemark Lund
8e61cb5402 Add a simple xsh test file 2016-08-29 08:48:27 +02:00
Morten Enemark Lund
4673a57ace Add pytest entry point to setup.py 2016-08-29 08:48:27 +02:00
Morten Enemark Lund
fe4e7af4bb Moved plugin from conftest to its own module 2016-08-29 08:48:26 +02:00
Morten Enemark Lund
7ff95bf6d7 Add an example test file 2016-08-29 08:47:57 +02:00
Morten Enemark Lund
eb79dd119a Added a changelog entry 2016-08-29 08:47:56 +02:00
Morten Enemark Lund
07f9c50e7e Added framework for collecting and running *.xsh files with py.test 2016-08-29 08:47:56 +02:00
BlahGeek
b3b38eee61 fix path completion for empty directories
Before this commit, `ls /tmp/empty_dir/<TAB>` would results `ls //`,
this commit fixes that bug
2016-08-29 14:07:54 +08:00
Jamie Bliss
2e24b9a698 Deal with leading backslash, too 2016-08-28 23:34:11 -04:00
laerus
a3c1dfd28e generators everywhere 2016-08-29 02:45:36 +03:00
laerus
db8f5bc0d5 ensure_slice bug for 0 2016-08-28 22:26:50 +03:00
laerus
ffb4e5e035 docs/tests 2016-08-28 22:17:26 +03:00
Anthony Scopatz
6a85244487 Merge branch 'master' into msub 2016-08-28 13:47:21 -04:00
Jamie Bliss
d8bc83cd51 Add some documentations 2016-08-28 13:43:08 -04:00
Gil Forsyth
5726735604 Merge pull request #1598 from xonsh/m
Function Macros
2016-08-28 13:43:03 -04:00
Jamie Bliss
0d791d1bea Add events to vox. 2016-08-28 13:37:23 -04:00
Anthony Scopatz
e19a0aa1e5 some copy edits from @gforsyth, I shouldn't write docs while jet lagged 2016-08-28 13:11:36 -04:00
laerus
494e0dc81f Merge branch 'master' of https://github.com/xonsh/xonsh into hist 2016-08-28 18:22:12 +03:00
Anthony Scopatz
9b73b4343d Merge pull request #1646 from xonsh/emfixes
Hot fix for pytest events
2016-08-28 11:03:56 -04:00
Anthony Scopatz
cdea36baa9 Merge branch 'm' into msub 2016-08-28 10:34:46 -04:00
Anthony Scopatz
bff2ccb6d1 Merge branch 'emfixes' into m 2016-08-28 10:33:56 -04:00
Anthony Scopatz
5985c3d33b hot fix for pytest events 2016-08-28 10:32:10 -04:00
Anthony Scopatz
78a87d0304 some emergency fixup 2016-08-28 09:57:31 -04:00
Anthony Scopatz
a884eec931 Merge branch 'm' into msub 2016-08-28 09:30:32 -04:00
Anthony Scopatz
2be49eab81 Merge branch 'master' into m 2016-08-28 09:30:09 -04:00