Commit graph

77 commits

Author SHA1 Message Date
Anthony Scopatz
67527baa6e summy styler must provide str to pygments, not none. 2017-02-18 20:34:40 -05:00
Anthony Scopatz
65385ff544 some bug fixes 2017-02-18 19:43:48 -05:00
Morten Enemark Lund
88abaf6348 Fix skip_if_on_conda decorator 2017-02-14 21:17:43 +01:00
Anthony Scopatz
a695c78e64 is -> in 2017-02-12 17:09:51 -05:00
Anthony Scopatz
cbc7282707 ws 2017-02-12 13:36:33 -05:00
Anthony Scopatz
75afffc54b merge cases 2017-02-12 12:52:13 -05:00
Anthony Scopatz
03646b987e skip on travis 2017-02-12 11:50:34 -05:00
Jamie Bliss
972ae6e689 Merge remote-tracking branch 'upstream/master' into event-transform_command 2017-01-12 13:22:23 -05:00
Konstantinos Tsakiltzidis
c62fb9beb6 Merge pull request #2072 from xonsh/source
source alias improvements
2017-01-12 11:39:33 +02:00
Hugo Wang
335fc71bc7 xonsh script.xsh should not fail over 2017-01-11 21:59:42 +08:00
Anthony Scopatz
264c48c0b1 added dummy swap 2017-01-08 20:23:25 -05:00
Jamie Bliss
6db7df4bec Add defaults to DummyEnv so we don't have to set up a basic environment every time. 2017-01-07 15:31:18 -05:00
Jamie Bliss
e5e2b08ed9 Revert "Move on_transform_command into parser."
This reverts commit 5b01f80829.
2017-01-05 22:07:55 -05:00
Jamie Bliss
5b01f80829 Move on_transform_command into parser.
Which involved as surprising amount of test refactorings.
2017-01-04 20:43:25 -05:00
Anthony Scopatz
eb80057975 Replaced backgroundable with threadable 2016-10-15 14:09:49 -04:00
Gil Forsyth
29af833ad8 fix remaining pep8 violations 2016-10-07 10:57:31 -04:00
Anthony Scopatz
37673da76a test fixes 2016-10-01 23:15:59 -04:00
Anthony Scopatz
dd7987ad85 test fixes 2016-09-28 23:45:40 -04:00
Anthony Scopatz
911021e0c3 firx for non-captured output 2016-09-24 15:15:38 -04:00
Anthony Scopatz
046a1160bc merge from master 2016-09-21 19:57:54 -04:00
Matthias Bussonnier
f83ff5b2c6 Start a Python 3.6 parser.
Write now not many changes, mostly async comprehension ast node takes a
mandatory 4th keyword.
2016-09-18 10:48:30 -07:00
Anthony Scopatz
2ad03a8164 more fixes 2016-09-09 00:58:32 -04:00
Anthony Scopatz
c5285a796a got some of it 2016-09-09 00:08:13 -04:00
Anthony Scopatz
71445888a9 some chanes 2016-09-08 21:40:18 -04:00
Anthony Scopatz
05a69358e6 another blank line 2016-08-19 12:11:37 -04:00
Anthony Scopatz
c8727f17b3 Added function arguments to scope 2016-08-19 01:45:44 -04:00
Gil Forsyth
fc3956c3fd remove unused os import 2016-07-26 14:05:01 -04:00
Gil Forsyth
afea01aefc better on_conda check that doesn't rely on which 2016-07-26 10:09:09 -04:00
Gil Forsyth
cb8ecdc440 hacky workaround for appveyor (for the moment) 2016-07-25 10:16:32 -04:00
Gil Forsyth
9ac3d29e7d add 'skip if on conda' fixture to vox tests 2016-07-23 17:27:27 -04:00
Leonardo Santagada
4337b1489b revert changes based on review 2016-07-20 22:07:45 +02:00
Leonardo Santagada
52aae3f173 unused imports and var 2016-07-18 10:07:30 +02:00
Leonardo Santagada
75fe2eccc8 more ignores 2016-07-18 10:06:35 +02:00
laerus
daf1928dd0 'fixtures docs' 2016-07-03 12:00:24 +03:00
laerus
36c0bcfd42 test execer/xonsh_execer fixture in conftest 2016-07-01 15:43:16 +03:00
Konstantinos Tsakiltzidis
1527ba6728 'slowly migrating tools' 2016-06-29 19:28:39 +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
Anthony Scopatz
3276d06f01 removed ENV 2016-06-28 20:22:11 -04:00
Konstantinos Tsakiltzidis
1dcb080a54 'partial test_replay' 2016-06-28 13:16:12 +03:00
Konstantinos Tsakiltzidis
5ccec32e12 test_environ part1 / tools small refactor 2016-06-27 18:39:10 +03:00
Paul Goelz
3cf38a7f65 Merge branch 'master' of https://github.com/xonsh/xonsh into sortglob 2016-06-26 22:15:03 +02:00
Paul Goelz
860b10707f PEP8 in xonsh/tools and test/tools 2016-06-26 22:09:16 +02:00
Konstantinos Tsakiltzidis
2c6fb2e6f7 'need more fixtures' 2016-06-25 13:38:43 +03:00
Konstantinos Tsakiltzidis
daf3f89ae8 TODO list, conftest.py, some migrations 2016-06-25 01:15:48 +03:00
Konstantinos Tsakiltzidis
4d67a47f59 test_tools, almost complete 2016-06-24 23:51:55 +03:00
Konstantinos Tsakiltzidis
1e9aed31f4 'parametrize ftw' 2016-06-24 18:16:16 +03:00
Morten Enemark Lund
cdf9e43bae Fix pytest skip 2016-06-23 14:46:15 +02:00
Konstantinos Tsakiltzidis
d0f5ae99b2 'fallack in test tools' 2016-06-23 12:28:31 +03:00
Konstantinos Tsakiltzidis
d9cd2f4dbe 'small tests tools.py refac' 2016-06-23 03:46:35 +03:00