Commit graph

4008 commits

Author SHA1 Message Date
laerus
31c5760182 'typoz' 2016-07-03 12:26:52 +03:00
laerus
0e7c8dc730 'test_imphooks fixture fix' 2016-07-03 12:02:02 +03:00
laerus
daf1928dd0 'fixtures docs' 2016-07-03 12:00:24 +03:00
laerus
da13f310f5 'info about writing the tests' 2016-07-03 11:43:22 +03:00
laerus
72307549c4 news update 2016-07-03 10:56:32 +03:00
laerus
fefb9539ba EnvPath bug, skipping 2016-07-02 04:53:37 +03:00
laerus
603681aa8a test_parser fix 2016-07-02 03:43:49 +03:00
laerus
de2745bc45 'test_environ new tests migration' 2016-07-02 03:36:32 +03:00
laerus
916999913e Merge branch 'master' into pytest_migration
maybe a fix for test_environ conflicts

Conflicts:
	tests/test_environ.py
2016-07-01 22:28:45 +03:00
laerus
bea8c62829 tests bugs fixing/test_parser & test_tools to go 2016-07-01 21:52:37 +03:00
Gil Forsyth
b45e00ab88 Merge pull request #1376 from xonsh/amalup
some amalgamate updates from @yaroslavvb
2016-07-01 14:02:17 -04:00
Anthony Scopatz
ecbf8f5ec0 Merge branch 'BlaXpirit-prompt-optional-items' 2016-07-01 14:00:54 -04:00
Anthony Scopatz
ea917401c1 amalup news 2016-07-01 13:51:23 -04:00
Oleh Prypin
9d74df0421 Document "optional items" in the prompt format string 2016-07-01 20:30:13 +03:00
Oleh Prypin
008c3e7951 News entry for prompt-optional-items 2016-07-01 19:07:20 +03:00
Oleh Prypin
bc11ba78db Test 'optional items' (format spec) in format_prompt 2016-07-01 19:07:20 +03:00
Oleh Prypin
f911613d95 Apply the new 'optional items' to the format string defaults 2016-07-01 19:07:20 +03:00
Oleh Prypin
07bfb86735 Implement a better way to add optional items to the prompt
Allow adding a format string to prompt items that is invoked only if the item is not empty
2016-07-01 19:07:20 +03:00
Oleh Prypin
fa91c6b21b Drop the separate implementation of format_prompt
It was used only in one place and can be replaced with partial_format_prompt
2016-07-01 19:07:20 +03:00
Anthony Scopatz
643849d6cf Merge pull request #1377 from BlaXpirit/no-bare-except
News entry for no-bare-except
2016-07-01 12:06:06 -04:00
Oleh Prypin
38e931b82e News entry for no-bare-except 2016-07-01 18:57:05 +03:00
Anthony Scopatz
c5ad065b60 some amalgamate updates from @yaroslavvb 2016-07-01 11:36:06 -04:00
laerus
b83906381e test_parser incomplete 2016-07-01 17:50:01 +03:00
Anthony Scopatz
aace5d77c0 Merge pull request #1375 from BlaXpirit/no-bare-except
Don't use bare `except:`
2016-07-01 10:16:09 -04:00
laerus
36c0bcfd42 test execer/xonsh_execer fixture in conftest 2016-07-01 15:43:16 +03:00
laerus
a05ca9b6af 'test_imphooks' 2016-07-01 13:52:44 +03:00
laerus
5aef18ccfb 'test_main' 2016-07-01 13:35:16 +03:00
laerus
f43ddcfe27 'revert test_parser' 2016-07-01 12:43:32 +03:00
laerus
320bb3b4da 'test_environ/lexer' 2016-07-01 12:42:07 +03:00
Oleh Prypin
f6834bae83 Don't use bare except:
Bare `except:` also catches SystemExit, KeyboardInterrupt, GeneratorExit, causing unexpected problems.

Fixes #1372
2016-07-01 10:14:13 +03:00
laerus
6476c8491a test_tools repair 2016-06-30 23:00:00 +03:00
Anthony Scopatz
139cb5b6fd version bump to 0.4.3 2016-06-30 14:52:02 -04:00
Morten Enemark Lund
41d1fc64dc Merge pull request #1374 from xonsh/setupexc
Some git version setup imporvements
2016-06-30 20:43:08 +02:00
Anthony Scopatz
607ac427a0 better git messaging 2016-06-30 13:32:59 -04:00
Anthony Scopatz
63c26892cd except everything 2016-06-30 13:30:16 -04:00
Anthony Scopatz
ffa6fad3d5 Merge pull request #1373 from xonsh/xonda
add xonda to xontribs
2016-06-30 13:05:22 -04:00
Gil Forsyth
4c4fddc80d add xonda to xontribs 2016-06-30 12:42:37 -04:00
Anthony Scopatz
10954bb406 Merge branch 'master' of github.com:xonsh/xonsh 2016-06-30 12:25:06 -04:00
Anthony Scopatz
bde05da579 copyright update 2016-06-30 12:24:55 -04:00
Anthony Scopatz
44545fb853 Merge pull request #1371 from Granitas/vox_tabcomplete
add entry for vox-tabcomplete xontrib
2016-06-30 12:14:53 -04:00
Morten Enemark Lund
876b2fd1ff Merge pull request #1359 from xonsh/bgmod
Background thread module loading
2016-06-30 16:00:47 +02:00
Bernardas
386c1a42e7 add entry for vox-tabcomplete xontrib 2016-06-30 09:34:31 +00:00
Anthony Scopatz
f58ef01161 Merge branch 'master' into bgmod 2016-06-29 12:41:19 -04:00
Konstantinos Tsakiltzidis
1527ba6728 'slowly migrating tools' 2016-06-29 19:28:39 +03:00
Konstantinos Tsakiltzidis
2f2f1622c9 'test_builtins' 2016-06-29 18:32:42 +03:00
Konstantinos Tsakiltzidis
cc9d558e75 'fixed conflicts' 2016-06-29 16:59:42 +03:00
Konstantinos Tsakiltzidis
ba6f63f143 Merge branch 'master' into pytest_migration 2016-06-29 16:58:08 +03:00
Morten Enemark Lund
6a0b9bd61d Merge pull request #1357 from xonsh/sub
LazyObject getitem
2016-06-29 12:17:48 +02:00
Morten Enemark Lund
e20b9b3008 Merge pull request #1358 from xonsh/path34
path fix for v3.4
2016-06-29 12:15:17 +02:00
Morten Enemark Lund
f6bb3b7bd6 Merge pull request #1367 from xonsh/rmenv
Removed ENV
2016-06-29 11:10:46 +02:00