mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3840 commits 40 branches 136 tags 39 MiB
Commit graph

3840 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Scopatz
8d564879f4 fixed name of apt_tabcomplete.xsh 2016-06-24 11:39:04 -04:00
Morten Enemark Lund
f3ecbe35a2 Merge pull request #1328 from xonsh/jload 
JSON load errors.
 2016-06-24 06:28:49 +02:00
Anthony Scopatz
8fbba6793e catch json.JSONDecodeError, which is a subclass of ValueError 2016-06-23 17:34:27 -04:00
Morten Enemark Lund
ecbcdac2d3 Merge pull request #945 from xonsh/pytest_port 
Pytest port
 2016-06-23 23:31:31 +02:00
Gil Forsyth
6d489843c3 update CONTRIBUTING with changes to pytest 2016-06-23 17:11:45 -04:00
Anthony Scopatz
4d63d63985 fix for os.environ lookup 2016-06-23 17:11:16 -04:00
Gil Forsyth
d5975ea758 remove run_tests 2016-06-23 17:04:28 -04:00
Gil Forsyth
6d98baa7d0 Merge branch 'master' into pytest_port 2016-06-23 15:52:53 -04:00
Gil Forsyth
58c34f2395 add changelog 2016-06-23 15:49:58 -04:00
Gil Forsyth
170d08f43f uncomment tests (my bad) 2016-06-23 15:04:28 -04:00
Morten Enemark Lund
ad8cb28891 Merge pull request #1326 from xonsh/fix_ptk_check 
fix `has_prompt_toolkit()`
 2016-06-23 20:40:40 +02:00
Gil Forsyth
e79772955c fix has_prompt_toolkit() 2016-06-23 14:19:54 -04:00
Morten Enemark Lund
064e86825d Better integration of the check_ast, check_stmts, check_xonsh, check_xonsh_ast assertion helpers 2016-06-23 20:16:58 +02:00
Morten Enemark Lund
ef04264a06 Add XONSH_ENCODING_ERRORS to TOOLS_ENV 2016-06-23 20:13:24 +02:00
Anthony Scopatz
9603611851 Merge pull request #1277 from laerus/xonsh-argument-fix-i1073 
complain on invalid cli arguments
 2016-06-23 12:25:37 -04:00
Gil Forsyth
af970448cb make sure PATHEXT is available in windows test 2016-06-23 11:45:00 -04:00
Gil Forsyth
a05defc857 fix EnvPath test failures 
EnvPath's `__getitem__` method calls `expandvars` which only performs
expansion if the ENV_VAR `EXPAND_ENV_VARS` is `True`.  And since our
environments aren't bleeding over into the tests anymore, this wasn't
being set.  So a quick mock env added in to the expansion tests and
we're good to go.
 2016-06-23 10:25:42 -04:00
Gil Forsyth
2f4adb2cbe fix skip error (no yield inside skipped functions) 
note that pytest is a bit finicky about how it skips things.  we can't
use the `yield check_ast, asdf, asdf` format within a skipped function
since it will still be parsed and in the case of python3.5 only syntax,
python3.4 barfs
 2016-06-23 09:59:21 -04:00
Morten Enemark Lund
cdf9e43bae Fix pytest skip 2016-06-23 14:46:15 +02:00
Morten Enemark Lund
f97bc80334 Merge pull request #1321 from laerus/pytest_port 
figuring out why travis cries with pytest
 2016-06-23 14:21:05 +02:00
Morten Enemark Lund
058a5b1a6e Merge pull request #1320 from xonsh/aderef 
fix alias preference issue
 2016-06-23 14:16:38 +02:00
Konstantinos Tsakiltzidis
f40a6e3170 'escape 3.5 tests with if instead of skip' 2016-06-23 13:01:20 +03:00
Konstantinos Tsakiltzidis
c7aabbb3b5 'nose bleeds' 2016-06-23 12:48:01 +03:00
Konstantinos Tsakiltzidis
6ecaa4e3d0 'ON_MAC madness' 2016-06-23 12:33:26 +03:00
Konstantinos Tsakiltzidis
d0f5ae99b2 'fallack in test tools' 2016-06-23 12:28:31 +03:00
Konstantinos Tsakiltzidis
7dfec26dbe 'these bugs slip nose?' 2016-06-23 12:16:20 +03:00
Anthony Scopatz
0ba57c4035 fix alias preference issue 2016-06-22 22:46:48 -04:00
Gil Forsyth
f94f453cac Merge pull request #1281 from xonsh/shtty 
typo for cygwin job control
 2016-06-22 22:02:27 -04:00
Gil Forsyth
1f1a159dff Merge pull request #1319 from laerus/pytest_port 
merge from master and replace some new nose test with pytest
 2016-06-22 20:48:55 -04:00
Konstantinos Tsakiltzidis
d9cd2f4dbe 'small tests tools.py refac' 2016-06-23 03:46:35 +03:00
Konstantinos Tsakiltzidis
b329fffd39 setup_module on test_imphooks 2016-06-23 03:41:36 +03:00
Konstantinos Tsakiltzidis
673999e799 'new nose to pytest' 2016-06-23 03:30:55 +03:00
Konstantinos Tsakiltzidis
4b5119fc75 Merge branch 'master' into pytest_port 2016-06-23 03:02:39 +03:00
Konstantinos Tsakiltzidis
b55fcee067 'main isatty mock/typo' 2016-06-23 02:46:34 +03:00
Gil Forsyth
bd78cbffd4 more fixes for test skipping 2016-06-22 18:51:56 -04:00
Gil Forsyth
698193c5e2 update skip reason 2016-06-22 18:32:14 -04:00
Gil Forsyth
560ebb5b1d ugly hack on test_main and finish test_history 2016-06-22 18:28:07 -04:00
Gil Forsyth
6f4fc7564e cleanup and extra fixes 2016-06-22 18:23:36 -04:00
Gil Forsyth
4eff251964 remove all nose imports and calls everywhere 2016-06-22 18:06:44 -04:00
Gil Forsyth
de745dc1f6 remove spurious import and update test_main 2016-06-22 17:49:54 -04:00
Gil Forsyth
af70c5d493 denose test imphooks 2016-06-22 17:48:35 -04:00
Gil Forsyth
9fdc062427 update history tests to pytest 2016-06-22 17:41:13 -04:00
Gil Forsyth
7e254d681e change all skip syntax to pytest 2016-06-22 17:32:02 -04:00
Gil Forsyth
965c802eff port test_environ to pytest 2016-06-22 17:14:27 -04:00
Gil Forsyth
81ab922a12 port ast and contexts to pytest 2016-06-22 17:12:33 -04:00
Gil Forsyth
458e204cfc add quiet flag to pytest 2016-06-22 16:32:30 -04:00
Gil Forsyth
b3e2876fd2 Merge pull request #1315 from laerus/pytest_port 
bb nose
 2016-06-22 16:27:15 -04:00
Konstantinos Tsakiltzidis
aa163fbc0a 'replay/wizard' 2016-06-22 23:20:37 +03:00
Konstantinos Tsakiltzidis
201d068b72 'ptk history/multiline' 2016-06-22 23:17:33 +03:00
Gil Forsyth
b2981f2169 update travis and appveyor to run pytest (hopefully) 2016-06-22 16:17:04 -04:00